diff options
| author | Andy McFadden <fadden@android.com> | 2013-10-11 21:39:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-11 21:39:49 +0000 |
| commit | 6410c8c4097f1a3246aa3d03b3291d47f982bc4b (patch) | |
| tree | c6f03d8a1738a1e84045e5d1ce4d62a06493a674 | |
| parent | 9c0dfa09731a8366a7cdcd7171dde64b73af0d5c (diff) | |
| parent | c6f216955966e93ea983ba800e651af3de6c90e3 (diff) | |
| download | native-6410c8c4097f1a3246aa3d03b3291d47f982bc4b.tar.gz | |
Merge "Use black for blackout layer" into klp-dev
| -rw-r--r-- | services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp b/services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp index 1cd8cb34cd..521a5d2619 100644 --- a/services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp +++ b/services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp @@ -46,7 +46,7 @@ GLES11RenderEngine::GLES11RenderEngine() { } } pack565; - const uint16_t protTexData[] = { pack565(0x03, 0x03, 0x03) }; + const uint16_t protTexData[] = { 0 }; glGenTextures(1, &mProtectedTexName); glBindTexture(GL_TEXTURE_2D, mProtectedTexName); glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); diff --git a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp index 7112ca8d21..a2a6270fd3 100644 --- a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp +++ b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp @@ -50,7 +50,7 @@ GLES20RenderEngine::GLES20RenderEngine() : } } pack565; - const uint16_t protTexData[] = { pack565(0x03, 0x03, 0x03) }; + const uint16_t protTexData[] = { 0 }; glGenTextures(1, &mProtectedTexName); glBindTexture(GL_TEXTURE_2D, mProtectedTexName); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); |