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

This commit is contained in:
Andy McFadden 2013-10-11 21:39:49 +00:00 committed by Android (Google) Code Review
commit 6410c8c409
2 changed files with 2 additions and 2 deletions

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

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