diff options
| author | 2020-03-05 20:26:02 +0000 | |
|---|---|---|
| committer | 2020-03-05 20:26:02 +0000 | |
| commit | a3d7dbf640bbd58affead167dd66f8477ac8f4b4 (patch) | |
| tree | d4e9b483fbb2d71da5719b433b6f04a861ef4986 /libs | |
| parent | 15a63a8b8fde09c61b62cb11dd70112019d6c7d0 (diff) | |
| parent | 9d3bbd4b7eb4ee3cf9f5608deecb5b769e93e57e (diff) | |
Merge "Remove unused texture." into rvc-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/renderengine/gl/GLESRenderEngine.cpp | 9 | ||||
| -rw-r--r-- | libs/renderengine/gl/GLESRenderEngine.h | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/libs/renderengine/gl/GLESRenderEngine.cpp b/libs/renderengine/gl/GLESRenderEngine.cpp index 416ebfefc4..0d4305b868 100644 --- a/libs/renderengine/gl/GLESRenderEngine.cpp +++ b/libs/renderengine/gl/GLESRenderEngine.cpp @@ -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) { diff --git a/libs/renderengine/gl/GLESRenderEngine.h b/libs/renderengine/gl/GLESRenderEngine.h index 4cd0b3d3b5..32dbad1050 100644 --- a/libs/renderengine/gl/GLESRenderEngine.h +++ b/libs/renderengine/gl/GLESRenderEngine.h @@ -178,7 +178,6 @@ private: EGLSurface mDummySurface; EGLContext mProtectedEGLContext; EGLSurface mProtectedDummySurface; - GLuint mProtectedTexName; GLint mMaxViewportDims[2]; GLint mMaxTextureSize; GLuint mVpWidth; |