diff options
author | 2014-06-17 08:38:31 -0700 | |
---|---|---|
committer | 2014-06-17 08:38:31 -0700 | |
commit | c3b3266b7db2f1a41d41ecac010c766b7ad8eebc (patch) | |
tree | c45d9892b2ac00bfe74f322eafb6e68d8121a9ea /src/gpu/SkGr.cpp | |
parent | a272d6d0653620cb6b683a70d3e6993d380147d9 (diff) |
hide SkBitmap::Config entirely (behind a flag)
patch from issue 339463002
TBR=
I think the NoGPU failure is unrelated, so ignoring
NOTRY=True
Author: reed@google.com
Review URL: https://codereview.chromium.org/340533002
Diffstat (limited to 'src/gpu/SkGr.cpp')
-rw-r--r-- | src/gpu/SkGr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 34e5d0fde3..8e7cea64d4 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -343,6 +343,7 @@ void GrUnlockAndUnrefCachedBitmapTexture(GrTexture* texture) { /////////////////////////////////////////////////////////////////////////////// +#ifdef SK_SUPPORT_LEGACY_BITMAP_CONFIG GrPixelConfig SkBitmapConfig2GrPixelConfig(SkBitmap::Config config) { switch (config) { case SkBitmap::kA8_Config: @@ -360,6 +361,7 @@ GrPixelConfig SkBitmapConfig2GrPixelConfig(SkBitmap::Config config) { return kUnknown_GrPixelConfig; } } +#endif // alphatype is ignore for now, but if GrPixelConfig is expanded to encompass // alpha info, that will be considered. |