ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

am af4ae923: am 6410c8c4: Merge "Use black for blackout layer" into klp-dev

Browse Source 
* commit 'af4ae923c3f8a2e40d74eb6291da16b4a6514449':
  Use black for blackout layer
This commit is contained in:
Andy McFadden 2013-10-14 10:48:32 -07:00 committed by Android Git Automerger
commit 9c8b3097e6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp
View File

@ -46,7 +46,7 @@ GLES11RenderEngine::GLES11RenderEngine() {
} }
} pack565; } pack565;
const uint16_t protTexData[] = { pack565(0x03, 0x03, 0x03) }; const uint16_t protTexData[] = { 0 };
glGenTextures(1, &mProtectedTexName); glGenTextures(1, &mProtectedTexName);
glBindTexture(GL_TEXTURE_2D, mProtectedTexName); glBindTexture(GL_TEXTURE_2D, mProtectedTexName);
glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

2
services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
View File

@ -50,7 +50,7 @@ GLES20RenderEngine::GLES20RenderEngine() :
} }
} pack565; } pack565;
const uint16_t protTexData[] = { pack565(0x03, 0x03, 0x03) }; const uint16_t protTexData[] = { 0 };
glGenTextures(1, &mProtectedTexName); glGenTextures(1, &mProtectedTexName);
glBindTexture(GL_TEXTURE_2D, mProtectedTexName); glBindTexture(GL_TEXTURE_2D, mProtectedTexName);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);