diff options
| author | 2014-07-08 12:36:44 -0400 | |
|---|---|---|
| committer | 2014-07-08 15:05:38 -0400 | |
| commit | 1103b3255945d2eb2fa9c191e84e2270b343cca9 (patch) | |
| tree | 3dd01f46c6a3479974410024250408950ad9859f /libs/hwui/LayerRenderer.cpp | |
| parent | a3bf3e5c849bfb3bf0a74dcc06ef032355183c2e (diff) | |
SkBitmap::Config is deprecated, use SkColorType
Change-Id: Ic953741325607bf85598c097bb3ab648d4a08996
Diffstat (limited to 'libs/hwui/LayerRenderer.cpp')
| -rw-r--r-- | libs/hwui/LayerRenderer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp index 873baf5010d1..a92ef94e0c8c 100644 --- a/libs/hwui/LayerRenderer.cpp +++ b/libs/hwui/LayerRenderer.cpp @@ -383,20 +383,20 @@ bool LayerRenderer::copyLayer(RenderState& renderState, Layer* layer, SkBitmap* GLenum error = GL_NO_ERROR; bool status = false; - switch (bitmap->config()) { - case SkBitmap::kA8_Config: + switch (bitmap->colorType()) { + case kAlpha_8_SkColorType: format = GL_ALPHA; type = GL_UNSIGNED_BYTE; break; - case SkBitmap::kRGB_565_Config: + case kRGB_565_SkColorType: format = GL_RGB; type = GL_UNSIGNED_SHORT_5_6_5; break; - case SkBitmap::kARGB_4444_Config: + case kARGB_4444_SkColorType: format = GL_RGBA; type = GL_UNSIGNED_SHORT_4_4_4_4; break; - case SkBitmap::kARGB_8888_Config: + case kN32_SkColorType: default: format = GL_RGBA; type = GL_UNSIGNED_BYTE; |