commit 6410c8c4097f1a3246aa3d03b3291d47f982bc4b
author Andy McFadden <fadden@android.com> Fri Oct 11 21:39:49 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 11 21:39:49 2013 +0000
tree c6f03d8a1738a1e84045e5d1ce4d62a06493a674
parent 9c0dfa09731a8366a7cdcd7171dde64b73af0d5c
parent c6f216955966e93ea983ba800e651af3de6c90e3

Merge "Use black for blackout layer" into klp-dev

services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp

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 @@
         }
     } 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);

services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp

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 @@
         }
     } 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);