From e2c74e8ea5aeca29ecd1e6ddb2a1f8d7323a7321 Mon Sep 17 00:00:00 2001 From: tfarley Date: Fri, 29 Apr 2016 14:34:51 -0400 Subject: [PATCH] Fixup: all-state resets --- src/video_core/renderer_opengl/gl_state.cpp | 133 ++++++++++++++------ src/video_core/renderer_opengl/gl_state.h | 5 +- 2 files changed, 100 insertions(+), 38 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp index b706d5669..fdb345d99 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp @@ -2,15 +2,18 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include +#include "common/assert.h" #include "common/common_funcs.h" #include "common/logging/log.h" #include "video_core/renderer_opengl/gl_state.h" -static OpenGLState default_state; -OpenGLState* OpenGLState::cur_state = &default_state; +std::set states; +OpenGLState default_state; +OpenGLState* cur_state = &default_state; OpenGLState::OpenGLState() { // These all match default OpenGL values @@ -62,6 +65,12 @@ OpenGLState::OpenGLState() { draw.vertex_buffer = 0; draw.uniform_buffer = 0; draw.shader_program = 0; + + states.insert(this); +} + +OpenGLState::~OpenGLState() { + states.erase(this); } OpenGLState* OpenGLState::GetCurrentState() { @@ -94,12 +103,16 @@ void OpenGLState::MakeCurrent() { SetLogicOp(logic_op); + GLenum prev_active_texture_unit = active_texture_unit; for (unsigned i = 0; i < ARRAY_SIZE(texture_units); ++i) { - SetActiveTextureUnit(GL_TEXTURE0 + i); + glActiveTexture(GL_TEXTURE0 + i); + active_texture_unit = GL_TEXTURE0 + i; SetTexture1D(texture_units[i].texture_1d); SetTexture2D(texture_units[i].texture_2d); SetSampler(texture_units[i].sampler); } + active_texture_unit = prev_active_texture_unit; + glActiveTexture(cur_state->active_texture_unit); SetActiveTextureUnit(active_texture_unit); @@ -347,61 +360,111 @@ void OpenGLState::SetShaderProgram(GLuint n_shader_program) { } void OpenGLState::ResetTexture(GLuint handle) { - for (unsigned i = 0; i < ARRAY_SIZE(texture_units); ++i) { - if (cur_state->texture_units[i].texture_1d == handle) { - GLenum prev_active_texture_unit = cur_state->active_texture_unit; - cur_state->SetActiveTextureUnit(GL_TEXTURE0 + i); - cur_state->SetTexture1D(0); - cur_state->SetActiveTextureUnit(prev_active_texture_unit); - } + for (OpenGLState* state : states) { + for (unsigned i = 0; i < ARRAY_SIZE(texture_units); ++i) { + if (state->texture_units[i].texture_1d == handle) { + if (state == cur_state) { + GLenum prev_active_texture_unit = state->active_texture_unit; + state->SetActiveTextureUnit(GL_TEXTURE0 + i); + state->SetTexture1D(0); + state->SetActiveTextureUnit(prev_active_texture_unit); + } else { + state->texture_units[i].texture_1d = 0; + } + } - if (cur_state->texture_units[i].texture_2d == handle) { - GLenum prev_active_texture_unit = cur_state->active_texture_unit; - cur_state->SetActiveTextureUnit(GL_TEXTURE0 + i); - cur_state->SetTexture2D(0); - cur_state->SetActiveTextureUnit(prev_active_texture_unit); + if (state->texture_units[i].texture_2d == handle) { + if (state == cur_state) { + GLenum prev_active_texture_unit = state->active_texture_unit; + state->SetActiveTextureUnit(GL_TEXTURE0 + i); + state->SetTexture2D(0); + state->SetActiveTextureUnit(prev_active_texture_unit); + } else { + state->texture_units[i].texture_2d = 0; + } + } } } } void OpenGLState::ResetSampler(GLuint handle) { - for (unsigned i = 0; i < ARRAY_SIZE(texture_units); ++i) { - if (cur_state->texture_units[i].sampler == handle) { - GLenum prev_active_texture_unit = cur_state->active_texture_unit; - cur_state->SetActiveTextureUnit(GL_TEXTURE0 + i); - cur_state->SetSampler(0); - cur_state->SetActiveTextureUnit(prev_active_texture_unit); + for (OpenGLState* state : states) { + for (unsigned i = 0; i < ARRAY_SIZE(texture_units); ++i) { + if (state->texture_units[i].sampler == handle) { + if (state == cur_state) { + GLenum prev_active_texture_unit = state->active_texture_unit; + state->SetActiveTextureUnit(GL_TEXTURE0 + i); + state->SetSampler(0); + state->SetActiveTextureUnit(prev_active_texture_unit); + } else { + state->texture_units[i].sampler = 0; + } + } } } } void OpenGLState::ResetProgram(GLuint handle) { - if (cur_state->draw.shader_program == handle) { - cur_state->SetShaderProgram(0); + for (OpenGLState* state : states) { + if (state->draw.shader_program == handle) { + if (state == cur_state) { + state->SetShaderProgram(0); + } else { + state->draw.shader_program = 0; + } + } } } void OpenGLState::ResetBuffer(GLuint handle) { - if (cur_state->draw.vertex_buffer == handle) { - cur_state->SetVertexBuffer(0); - } - if (cur_state->draw.uniform_buffer == handle) { - cur_state->SetUniformBuffer(0); + for (OpenGLState* state : states) { + if (state->draw.vertex_buffer == handle) { + if (state == cur_state) { + state->SetVertexBuffer(0); + } else { + state->draw.vertex_buffer = 0; + } + } + + if (state->draw.uniform_buffer == handle) { + if (state == cur_state) { + state->SetUniformBuffer(0); + } else { + state->draw.uniform_buffer = 0; + } + } } } void OpenGLState::ResetVertexArray(GLuint handle) { - if (cur_state->draw.vertex_array == handle) { - cur_state->SetVertexArray(0); + for (OpenGLState* state : states) { + if (state->draw.vertex_array == handle) { + if (state == cur_state) { + state->SetVertexArray(0); + } else { + state->draw.vertex_array = 0; + } + } } } void OpenGLState::ResetFramebuffer(GLuint handle) { - if (cur_state->draw.read_framebuffer == handle) { - cur_state->SetReadFramebuffer(0); - } - if (cur_state->draw.draw_framebuffer == handle) { - cur_state->SetDrawFramebuffer(0); + for (OpenGLState* state : states) { + if (state->draw.read_framebuffer == handle) { + if (state == cur_state) { + state->SetReadFramebuffer(0); + } else { + state->draw.read_framebuffer = 0; + } + } + + if (state->draw.draw_framebuffer == handle) { + if (state == cur_state) { + state->SetDrawFramebuffer(0); + } else { + state->draw.draw_framebuffer = 0; + } + } } } diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h index 46c1d9189..8d10f7cdb 100644 --- a/src/video_core/renderer_opengl/gl_state.h +++ b/src/video_core/renderer_opengl/gl_state.h @@ -9,6 +9,7 @@ class OpenGLState { public: OpenGLState(); + ~OpenGLState(); /// Get a pointer to the currently bound state tracker object static OpenGLState* GetCurrentState(); @@ -51,7 +52,7 @@ public: void SetUniformBuffer(GLuint n_uniform_buffer); void SetShaderProgram(GLuint n_shader_program); - /// Resets and unbinds any references to the given resource in the current OpenGL state + /// Resets and unbinds any references to the given resource across all existing states static void ResetTexture(GLuint handle); static void ResetSampler(GLuint handle); static void ResetProgram(GLuint handle); @@ -127,6 +128,4 @@ private: GLuint uniform_buffer; // GL_UNIFORM_BUFFER_BINDING GLuint shader_program; // GL_CURRENT_PROGRAM } draw; - - static OpenGLState* cur_state; };