diff options
| author |  reed <reed@google.com> | 2016-08-05 12:07:41 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-05 12:07:41 -0700 |
| commit | 1ec04d9553af68b458c8dd6bd18d8c25ebd41d7a (patch) | |
| tree | 11c3db498c2c6705366cc02789597ee59c2cbd8c /gm | |
| parent | 40254c2c2dc28a34f96294d5a1ad94a99b0be8a6 (diff) | |
rename FoceCopyMode to SkCopyPixelMode
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2220603002
Review-Url: https://codereview.chromium.org/2220603002
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/lightingshader.cpp | 10 | ||||
| -rw-r--r-- | gm/lightingshader2.cpp | 15 | ||||
| -rw-r--r-- | gm/lightingshaderbevel.cpp | 6 |
3 files changed, 13 insertions, 18 deletions
diff --git a/gm/lightingshader.cpp b/gm/lightingshader.cpp index 2cf4a953d8..54318ee445 100644 --- a/gm/lightingshader.cpp +++ b/gm/lightingshader.cpp @@ -6,8 +6,6 @@ */ #include "gm.h" - -#include "SkBitmapProcShader.h" #include "SkLightingShader.h" #include "SkNormalSource.h" #include "SkPoint3.h" @@ -100,10 +98,10 @@ protected: const SkMatrix& ctm = canvas->getTotalMatrix(); SkPaint paint; - sk_sp<SkShader> diffuseShader = SkMakeBitmapShader(fDiffuse, - SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &matrix, nullptr); - sk_sp<SkShader> normalMap = SkMakeBitmapShader(fNormalMaps[mapType], - SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &matrix, nullptr); + sk_sp<SkShader> diffuseShader = SkShader::MakeBitmapShader(fDiffuse, + SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &matrix); + sk_sp<SkShader> normalMap = SkShader::MakeBitmapShader(fNormalMaps[mapType], + SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &matrix); sk_sp<SkNormalSource> normalSource = SkNormalSource::MakeFromNormalMap(std::move(normalMap), ctm); paint.setShader(SkLightingShader::Make(std::move(diffuseShader), std::move(normalSource), diff --git a/gm/lightingshader2.cpp b/gm/lightingshader2.cpp index 9283449e2c..5e0d19b661 100644 --- a/gm/lightingshader2.cpp +++ b/gm/lightingshader2.cpp @@ -6,8 +6,6 @@ */ #include "gm.h" - -#include "SkBitmapProcShader.h" #include "SkLightingShader.h" #include "SkNormalSource.h" #include "SkPoint3.h" @@ -60,20 +58,21 @@ protected: sk_tool_utils::color_to_565(0x0), sk_tool_utils::color_to_565(0xFF804020), 8); - fOpaqueDiffuse = SkMakeBitmapShader(opaqueDiffuseMap, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode, &matrix, nullptr); + fOpaqueDiffuse = SkShader::MakeBitmapShader(opaqueDiffuseMap, SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode, &matrix); SkBitmap translucentDiffuseMap = sk_tool_utils::create_checkerboard_bitmap( kTexSize, kTexSize, SkColorSetARGB(0x55, 0x00, 0x00, 0x00), SkColorSetARGB(0x55, 0x80, 0x40, 0x20), 8); - fTranslucentDiffuse = SkMakeBitmapShader(translucentDiffuseMap, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode, &matrix, nullptr); + fTranslucentDiffuse = SkShader::MakeBitmapShader(translucentDiffuseMap, + SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode, &matrix); SkBitmap normalMap = make_frustum_normalmap(kTexSize); - fNormalMapShader = SkMakeBitmapShader(normalMap, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode, &matrix, nullptr); + fNormalMapShader = SkShader::MakeBitmapShader(normalMap, SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode, &matrix); } diff --git a/gm/lightingshaderbevel.cpp b/gm/lightingshaderbevel.cpp index d119a27cbd..dfc46e4471 100644 --- a/gm/lightingshaderbevel.cpp +++ b/gm/lightingshaderbevel.cpp @@ -6,8 +6,6 @@ */ #include "gm.h" - -#include "SkBitmapProcShader.h" #include "SkLightingShader.h" #include "SkNormalSource.h" #include "SkPath.h" @@ -54,8 +52,8 @@ protected: sk_tool_utils::color_to_565(0x0), sk_tool_utils::color_to_565(0xFF804020), 8); - fDiffuse = SkMakeBitmapShader(diffuseMap, SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode, &matrix, nullptr); + fDiffuse = SkShader::MakeBitmapShader(diffuseMap, SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode, &matrix); fConvexPath.moveTo(fRect.width() / 2.0f, 0.0f); fConvexPath.lineTo(0.0f, fRect.height()); |