diff options
author | bunnei <bunneidev@gmail.com> | 2015-08-11 17:19:45 -0400 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-08-11 17:19:45 -0400 |
commit | 93f607f5497a5fee142a0d2010881444a4ff0c80 (patch) | |
tree | 3728be088656eed0f4d53fde0f4ca194d640bf82 /src/video_core/renderer_opengl/gl_state.h | |
parent | df25b047f870d84bf7d37ccbbaf9bfb88a2ccd7f (diff) | |
parent | 254582aa35306c7bdebb90b0cd2dda88fe188087 (diff) |
Merge pull request #1023 from yuriks/gl-state-bugs
OpenGL: Fix state tracking in situations with reused object handles
Diffstat (limited to 'src/video_core/renderer_opengl/gl_state.h')
-rw-r--r-- | src/video_core/renderer_opengl/gl_state.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h index 26b91636..3e237902 100644 --- a/src/video_core/renderer_opengl/gl_state.h +++ b/src/video_core/renderer_opengl/gl_state.h @@ -53,7 +53,6 @@ public: // 3 texture units - one for each that is used in PICA fragment shader emulation struct { - bool enabled_2d; // GL_TEXTURE_2D GLuint texture_2d; // GL_TEXTURE_BINDING_2D } texture_units[3]; @@ -74,6 +73,12 @@ public: /// Apply this state as the current OpenGL state void Apply(); + static void ResetTexture(GLuint id); + static void ResetProgram(GLuint id); + static void ResetBuffer(GLuint id); + static void ResetVertexArray(GLuint id); + static void ResetFramebuffer(GLuint id); + private: static OpenGLState cur_state; }; |