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

Commit 983350b0 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove unused texture." into rvc-dev am: a3d7dbf6 

Change-Id: I0c503310f41405d3b656a86d63c3b6e276ef15e5
parents 55123c26 a3d7dbf6

libs/renderengine/gl/GLESRenderEngine.cpp

+0 −9
Original line number Diff line number Diff line
@@ -381,15 +381,6 @@ GLESRenderEngine::GLESRenderEngine(const RenderEngineCreationArgs& args, EGLDisp 
        LOG_ALWAYS_FATAL_IF(!success, "can't make default context current");

    }



    const uint16_t protTexData[] = {0};

    glGenTextures(1, &mProtectedTexName);

    glBindTexture(GL_TEXTURE_2D, mProtectedTexName);

    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);

    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);

    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, protTexData);



    // mColorBlindnessCorrection = M;



    if (mUseColorManagement) {

libs/renderengine/gl/GLESRenderEngine.h

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ private: 
    EGLSurface mDummySurface;

    EGLContext mProtectedEGLContext;

    EGLSurface mProtectedDummySurface;

    GLuint mProtectedTexName;

    GLint mMaxViewportDims[2];

    GLint mMaxTextureSize;

    GLuint mVpWidth;