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

Replace bitmap shaders with image shaders in test code

Browse Source 
Test: Verified that unit tests still pass.

Change-Id: I67d8046e49b9469e73caa9fe2a44ef2602c95d59
This commit is contained in:
Matt Sarett
2017-02-13 17:01:54 -05:00
parent fd9d0ee9f8
commit c54b76e97d
3 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,21 +48,17 @@ public:
SkBitmap bitmap;
SkPaint paint;
hwuiBitmap->getSkBitmapForShaders(&bitmap);
sk_sp<SkShader> repeatShader = SkMakeBitmapShader(bitmap,
sk_sp<SkImage> image = SkMakeImageFromRasterBitmap(bitmap, kNever_SkCopyPixelsMode);
sk_sp<SkShader> repeatShader = image->makeShader(
SkShader::TileMode::kRepeat_TileMode,
SkShader::TileMode::kRepeat_TileMode,
nullptr,
kNever_SkCopyPixelsMode,
nullptr);
paint.setShader(std::move(repeatShader));
canvas.drawRoundRect(0, 0, 500, 500, 50.0f, 50.0f, paint);
sk_sp<SkShader> mirrorShader = SkMakeBitmapShader(bitmap,
sk_sp<SkShader> mirrorShader = image->makeShader(
SkShader::TileMode::kMirror_TileMode,
SkShader::TileMode::kMirror_TileMode,
nullptr,
kNever_SkCopyPixelsMode,
nullptr);
paint.setShader(std::move(mirrorShader));
canvas.drawRoundRect(0, 600, 500, 1100, 50.0f, 50.0f, paint);

10
libs/hwui/tests/unit/RecordingCanvasTests.cpp
View File

@@ -748,11 +748,10 @@ OPENGL_PIPELINE_TEST(RecordingCanvas, refBitmapInShader_bitmapShader) {
SkPaint paint;
SkBitmap skBitmap;
bitmap->getSkBitmap(&skBitmap);
sk_sp<SkShader> shader = SkMakeBitmapShader(skBitmap,
sk_sp<SkImage> image = SkMakeImageFromRasterBitmap(skBitmap, kNever_SkCopyPixelsMode);
sk_sp<SkShader> shader = image->makeShader(
SkShader::TileMode::kClamp_TileMode,
SkShader::TileMode::kClamp_TileMode,
nullptr,
kNever_SkCopyPixelsMode,
nullptr);
paint.setShader(std::move(shader));
canvas.drawRoundRect(0, 0, 100, 100, 20.0f, 20.0f, paint);
@@ -767,11 +766,10 @@ OPENGL_PIPELINE_TEST(RecordingCanvas, refBitmapInShader_composeShader) {
SkPaint paint;
SkBitmap skBitmap;
bitmap->getSkBitmap(&skBitmap);
sk_sp<SkShader> shader1 = SkMakeBitmapShader(skBitmap,
sk_sp<SkImage> image = SkMakeImageFromRasterBitmap(skBitmap, kNever_SkCopyPixelsMode);
sk_sp<SkShader> shader1 = image->makeShader(
SkShader::TileMode::kClamp_TileMode,
SkShader::TileMode::kClamp_TileMode,
nullptr,
kNever_SkCopyPixelsMode,
nullptr);
SkPoint center;

6
libs/hwui/tests/unit/SkiaBehaviorTests.cpp
View File

@@ -39,12 +39,10 @@ SkBitmap createSkBitmap(int width, int height) {
*/
TEST(SkiaBehavior, CreateBitmapShader1x1) {
SkBitmap origBitmap = createSkBitmap(1, 1);
sk_sp<SkShader> s = SkMakeBitmapShader(
origBitmap,
sk_sp<SkImage> image = SkMakeImageFromRasterBitmap(origBitmap, kNever_SkCopyPixelsMode);
sk_sp<SkShader> s = image->makeShader(
SkShader::kClamp_TileMode,
SkShader::kRepeat_TileMode,
nullptr,
kNever_SkCopyPixelsMode,
nullptr);
SkBitmap bitmap;