Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af4ae923 authored by Andy McFadden's avatar Andy McFadden Committed by Android Git Automerger
Browse files

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

* commit '6410c8c4':
  Use black for blackout layer
parents 06c964d9 6410c8c4

services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);