Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to new factories for effects

Browse Source 
Test: make

Change-Id: Ib342878524b51d0eacf6c60ece3c7da8bf27d2c0
This commit is contained in:
Mike Reed
2019-04-10 16:57:52 -04:00
parent f0f8a1bfe1
commit 1c2f5fcc7e
12 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android/graphics/ColorFilter.cpp
View File

@@ -38,7 +38,7 @@ public:
static jlong CreateBlendModeFilter(JNIEnv* env, jobject, jint srcColor, jint modeHandle) {
SkBlendMode mode = static_cast<SkBlendMode>(modeHandle);
return reinterpret_cast<jlong>(SkColorFilter::MakeModeFilter(srcColor, mode).release());
return reinterpret_cast<jlong>(SkColorFilters::Blend(srcColor, mode).release());
}
static jlong CreateLightingFilter(JNIEnv* env, jobject, jint mul, jint add) {
@@ -50,7 +50,7 @@ public:
const float* src = autoArray.ptr();
#ifdef SK_SCALAR_IS_FLOAT
return reinterpret_cast<jlong>(SkColorFilter::MakeMatrixFilterRowMajor255(src).release());
return reinterpret_cast<jlong>(SkColorFilters::MatrixRowMajor255(src).release());
#else
SkASSERT(false);
#endif

10
core/jni/android/graphics/Shader.cpp
View File

@@ -77,7 +77,7 @@ static jlong BitmapShader_constructor(JNIEnv* env, jobject o, jlong matrixPtr, j
image = SkMakeImageFromRasterBitmap(bitmap, kNever_SkCopyPixelsMode);
}
sk_sp<SkShader> shader = image->makeShader(
(SkShader::TileMode)tileModeX, (SkShader::TileMode)tileModeY);
(SkTileMode)tileModeX, (SkTileMode)tileModeY);
ThrowIAE_IfNull(env, shader.get());
if (matrix) {
@@ -122,7 +122,7 @@ static jlong LinearGradient_create(JNIEnv* env, jobject, jlong matrixPtr,
sk_sp<SkShader> shader(SkGradientShader::MakeLinear(pts, &colors[0],
GraphicsJNI::getNativeColorSpace(colorSpaceHandle), pos, colors.size(),
static_cast<SkShader::TileMode>(tileMode), sGradientShaderFlags, nullptr));
static_cast<SkTileMode>(tileMode), sGradientShaderFlags, nullptr));
ThrowIAE_IfNull(env, shader);
const SkMatrix* matrix = reinterpret_cast<const SkMatrix*>(matrixPtr);
@@ -152,7 +152,7 @@ static jlong RadialGradient_create(JNIEnv* env, jobject, jlong matrixPtr, jfloat
sk_sp<SkShader> shader = SkGradientShader::MakeRadial(center, radius, &colors[0],
GraphicsJNI::getNativeColorSpace(colorSpaceHandle), pos, colors.size(),
static_cast<SkShader::TileMode>(tileMode), sGradientShaderFlags, nullptr);
static_cast<SkTileMode>(tileMode), sGradientShaderFlags, nullptr);
ThrowIAE_IfNull(env, shader);
const SkMatrix* matrix = reinterpret_cast<const SkMatrix*>(matrixPtr);
@@ -197,8 +197,8 @@ static jlong ComposeShader_create(JNIEnv* env, jobject o, jlong matrixPtr,
SkShader* shaderA = reinterpret_cast<SkShader *>(shaderAHandle);
SkShader* shaderB = reinterpret_cast<SkShader *>(shaderBHandle);
SkBlendMode mode = static_cast<SkBlendMode>(xfermodeHandle);
sk_sp<SkShader> baseShader(SkShader::MakeComposeShader(
sk_ref_sp(shaderA), sk_ref_sp(shaderB), mode));
sk_sp<SkShader> baseShader(SkShaders::Blend(mode,
sk_ref_sp(shaderA), sk_ref_sp(shaderB)));
SkShader* shader;

2
libs/hwui/CanvasTransform.cpp
View File

@@ -102,7 +102,7 @@ static void applyColorTransform(ColorTransform transform, SkPaint& paint) {
// TODO: LRU this or something to avoid spamming new color mode filters
if (paint.getColorFilter()->asColorMode(&color, &mode)) {
color = transformColor(transform, color);
paint.setColorFilter(SkColorFilter::MakeModeFilter(color, mode));
paint.setColorFilter(SkColorFilters::Blend(color, mode));
}
}
}

3
libs/hwui/SkiaCanvas.cpp
View File

@@ -631,8 +631,7 @@ void SkiaCanvas::drawBitmapMesh(Bitmap& bitmap, int meshWidth, int meshHeight,
SkPaint& tmpPaint = paintCoW.writeable();
sk_sp<SkImage> image = bitmap.makeImage();
sk_sp<SkShader> shader =
image->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
sk_sp<SkShader> shader = image->makeShader();
tmpPaint.setShader(std::move(shader));
mCanvas->drawVertices(builder.detach(), SkBlendMode::kModulate,

2
libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
View File

@@ -180,7 +180,7 @@ SkiaCanvas::PaintCoW&& SkiaRecordingCanvas::filterBitmap(PaintCoW&& paint,
if (colorSpaceFilter) {
if (tmpPaint.getColorFilter()) {
tmpPaint.setColorFilter(SkColorFilter::MakeComposeFilter(
tmpPaint.setColorFilter(SkColorFilters::Compose(
tmpPaint.refColorFilter(), std::move(colorSpaceFilter)));
} else {
tmpPaint.setColorFilter(std::move(colorSpaceFilter));

6
libs/hwui/tests/common/scenes/BitmapShaders.cpp
View File

@@ -46,14 +46,12 @@ public:
SkPaint paint;
sk_sp<SkImage> image = hwuiBitmap->makeImage();
sk_sp<SkShader> repeatShader =
image->makeShader(SkShader::TileMode::kRepeat_TileMode,
SkShader::TileMode::kRepeat_TileMode, nullptr);
image->makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat);
paint.setShader(std::move(repeatShader));
canvas.drawRoundRect(0, 0, 500, 500, 50.0f, 50.0f, paint);
sk_sp<SkShader> mirrorShader =
image->makeShader(SkShader::TileMode::kMirror_TileMode,
SkShader::TileMode::kMirror_TileMode, nullptr);
image->makeShader(SkTileMode::kMirror, SkTileMode::kMirror);
paint.setShader(std::move(mirrorShader));
canvas.drawRoundRect(0, 600, 500, 1100, 50.0f, 50.0f, paint);
}

7
libs/hwui/tests/common/scenes/HwBitmapInCompositeShader.cpp
View File

@@ -60,10 +60,10 @@ public:
colors[0] = Color::Black;
colors[1] = Color::White;
sk_sp<SkShader> gradientShader = SkGradientShader::MakeRadial(
center, 50, colors, nullptr, 2, SkShader::TileMode::kRepeat_TileMode);
center, 50, colors, nullptr, 2, SkTileMode::kRepeat);
sk_sp<SkShader> compositeShader(
SkShader::MakeComposeShader(hardwareShader, gradientShader, SkBlendMode::kDstATop));
SkShaders::Blend(SkBlendMode::kDstATop, hardwareShader, gradientShader));
SkPaint paint;
paint.setShader(std::move(compositeShader));
@@ -74,7 +74,6 @@ public:
sk_sp<SkShader> createBitmapShader(Bitmap& bitmap) {
sk_sp<SkImage> image = bitmap.makeImage();
return image->makeShader(SkShader::TileMode::kClamp_TileMode,
SkShader::TileMode::kClamp_TileMode);
return image->makeShader();
}
};

2
libs/hwui/tests/common/scenes/ListOfFadedTextAnimation.cpp
View File

@@ -44,7 +44,7 @@ class ListOfFadedTextAnimation : public TestListViewSceneBase {
SkColor colors[2] = {Color::Black, Color::Transparent};
sk_sp<SkShader> s(
SkGradientShader::MakeLinear(pts, colors, NULL, 2, SkShader::kClamp_TileMode));
SkGradientShader::MakeLinear(pts, colors, NULL, 2, SkTileMode::kClamp));
SkMatrix matrix;
matrix.setScale(1, length);

4
libs/hwui/tests/common/scenes/SimpleColorMatrixAnimation.cpp
View File

@@ -66,7 +66,7 @@ private:
matrix[SkColorMatrix::kB_Trans] = 5.0f;
matrix[SkColorMatrix::kA_Trans] = 10.0f;
paint.setColorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix));
paint.setColorFilter(SkColorFilters::MatrixRowMajor255(matrix));
// set a shader so it's not likely for the matrix to be optimized away (since a
// clever
@@ -75,7 +75,7 @@ private:
SkPoint pts[] = {SkPoint::Make(0, 0), SkPoint::Make(width, height)};
SkColor colors[2] = {Color::DeepPurple_500, Color::DeepOrange_500};
paint.setShader(SkGradientShader::MakeLinear(pts, colors, pos, 2,
SkShader::kClamp_TileMode));
SkTileMode::kClamp));
// overdraw several times to emphasize shader cost
for (int i = 0; i < 10; i++) {

2
libs/hwui/tests/common/scenes/SimpleGradientAnimation.cpp
View File

@@ -57,7 +57,7 @@ private:
// use i%2 start position to pick 2 color combo with black in it
SkColor colors[3] = {Color::Transparent, Color::Black, Color::Cyan_500};
paint.setShader(SkGradientShader::MakeLinear(pts, colors + (i % 2), pos, 2,
SkShader::kClamp_TileMode));
SkTileMode::kClamp));
canvas.drawRect(i, i, width, height, paint);
}
});

2
libs/hwui/tests/common/scenes/TvApp.cpp
View File

@@ -219,7 +219,7 @@ private:
image.get()));
SkPaint paint;
sk_sp<SkColorFilter> filter(
SkColorFilter::MakeModeFilter((curFrame % 150) << 24, SkBlendMode::kSrcATop));
SkColorFilters::Blend((curFrame % 150) << 24, SkBlendMode::kSrcATop));
paint.setColorFilter(filter);
sk_sp<Bitmap> bitmap = mCachedBitmaps[ci];
canvas->drawBitmap(*bitmap, 0, 0, &paint);

2
libs/hwui/tests/unit/VectorDrawableTests.cpp
View File

@@ -395,7 +395,7 @@ TEST(VectorDrawable, drawPathWithoutIncrementingShaderRefCount) {
bitmap.allocN32Pixels(5, 5, false);
SkCanvas canvas(bitmap);
sk_sp<SkShader> shader = SkShader::MakeColorShader(SK_ColorBLACK);
sk_sp<SkShader> shader = SkShaders::Color(SK_ColorBLACK);
// Initial ref count is 1
EXPECT_TRUE(shader->unique());