diff options
| author | Andy McFadden <fadden@android.com> | 2013-10-14 10:48:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-14 10:48:32 -0700 |
| commit | 9c8b3097e6a6023af0432a369740a98510faf975 (patch) | |
| tree | 1faed36f048dcbaae393b501655a34141ed21eef /services/surfaceflinger/RenderEngine | |
| parent | 218566c303c7b71d6991dce2dfdd8d718659c368 (diff) | |
| parent | af4ae923c3f8a2e40d74eb6291da16b4a6514449 (diff) | |
| download | frameworks_native-9c8b3097e6a6023af0432a369740a98510faf975.zip frameworks_native-9c8b3097e6a6023af0432a369740a98510faf975.tar.gz frameworks_native-9c8b3097e6a6023af0432a369740a98510faf975.tar.bz2 | |
am af4ae923: am 6410c8c4: Merge "Use black for blackout layer" into klp-dev
* commit 'af4ae923c3f8a2e40d74eb6291da16b4a6514449':
Use black for blackout layer
Diffstat (limited to 'services/surfaceflinger/RenderEngine')
| -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); |