diff options
| author | Andy McFadden <fadden@android.com> | 2013-10-11 14:47:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 14:47:25 -0700 |
| commit | af4ae923c3f8a2e40d74eb6291da16b4a6514449 (patch) | |
| tree | b439229ab3455ce703fb5e2b14f65418dc8f6b4f | |
| parent | 06c964d9b31ac81d3521f97427cdab77ee7d1cff (diff) | |
| parent | 6410c8c4097f1a3246aa3d03b3291d47f982bc4b (diff) | |
| download | frameworks_native-af4ae923c3f8a2e40d74eb6291da16b4a6514449.zip frameworks_native-af4ae923c3f8a2e40d74eb6291da16b4a6514449.tar.gz frameworks_native-af4ae923c3f8a2e40d74eb6291da16b4a6514449.tar.bz2 | |
am 6410c8c4: Merge "Use black for blackout layer" into klp-dev
* commit '6410c8c4097f1a3246aa3d03b3291d47f982bc4b':
Use black for blackout layer
| -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 1cd8cb3..521a5d2 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 7112ca8..a2a6270 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); |