diff options
| author | 2019-01-06 00:28:01 -0300 | |
|---|---|---|
| committer | 2019-01-06 00:28:01 -0300 | |
| commit | ea4928393f164723e904cf2192a5b724f11ef844 (patch) | |
| tree | 50722df05cd4acfffafaf30c0e65c644987e07d6 /src | |
| parent | Merge pull request #1988 from lioncash/res (diff) | |
| download | yuzu-ea4928393f164723e904cf2192a5b724f11ef844.tar.gz yuzu-ea4928393f164723e904cf2192a5b724f11ef844.tar.xz yuzu-ea4928393f164723e904cf2192a5b724f11ef844.zip | |
gl_state: Drop uniform buffer state tracking
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_state.cpp | 8 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_state.h | 1 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 1 |
3 files changed, 0 insertions, 10 deletions
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp index dc0a5ed5e..e54aff995 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp | |||
| @@ -84,7 +84,6 @@ OpenGLState::OpenGLState() { | |||
| 84 | draw.draw_framebuffer = 0; | 84 | draw.draw_framebuffer = 0; |
| 85 | draw.vertex_array = 0; | 85 | draw.vertex_array = 0; |
| 86 | draw.vertex_buffer = 0; | 86 | draw.vertex_buffer = 0; |
| 87 | draw.uniform_buffer = 0; | ||
| 88 | draw.shader_program = 0; | 87 | draw.shader_program = 0; |
| 89 | draw.program_pipeline = 0; | 88 | draw.program_pipeline = 0; |
| 90 | 89 | ||
| @@ -544,10 +543,6 @@ void OpenGLState::ApplyDepthClamp() const { | |||
| 544 | void OpenGLState::Apply() const { | 543 | void OpenGLState::Apply() const { |
| 545 | ApplyFramebufferState(); | 544 | ApplyFramebufferState(); |
| 546 | ApplyVertexBufferState(); | 545 | ApplyVertexBufferState(); |
| 547 | // Uniform buffer | ||
| 548 | if (draw.uniform_buffer != cur_state.draw.uniform_buffer) { | ||
| 549 | glBindBuffer(GL_UNIFORM_BUFFER, draw.uniform_buffer); | ||
| 550 | } | ||
| 551 | 546 | ||
| 552 | // Shader program | 547 | // Shader program |
| 553 | if (draw.shader_program != cur_state.draw.shader_program) { | 548 | if (draw.shader_program != cur_state.draw.shader_program) { |
| @@ -642,9 +637,6 @@ OpenGLState& OpenGLState::ResetBuffer(GLuint handle) { | |||
| 642 | if (draw.vertex_buffer == handle) { | 637 | if (draw.vertex_buffer == handle) { |
| 643 | draw.vertex_buffer = 0; | 638 | draw.vertex_buffer = 0; |
| 644 | } | 639 | } |
| 645 | if (draw.uniform_buffer == handle) { | ||
| 646 | draw.uniform_buffer = 0; | ||
| 647 | } | ||
| 648 | return *this; | 640 | return *this; |
| 649 | } | 641 | } |
| 650 | 642 | ||
diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h index 439bfbc98..170dd4047 100644 --- a/src/video_core/renderer_opengl/gl_state.h +++ b/src/video_core/renderer_opengl/gl_state.h | |||
| @@ -155,7 +155,6 @@ public: | |||
| 155 | GLuint draw_framebuffer; // GL_DRAW_FRAMEBUFFER_BINDING | 155 | GLuint draw_framebuffer; // GL_DRAW_FRAMEBUFFER_BINDING |
| 156 | GLuint vertex_array; // GL_VERTEX_ARRAY_BINDING | 156 | GLuint vertex_array; // GL_VERTEX_ARRAY_BINDING |
| 157 | GLuint vertex_buffer; // GL_ARRAY_BUFFER_BINDING | 157 | GLuint vertex_buffer; // GL_ARRAY_BUFFER_BINDING |
| 158 | GLuint uniform_buffer; // GL_UNIFORM_BUFFER_BINDING | ||
| 159 | GLuint shader_program; // GL_CURRENT_PROGRAM | 158 | GLuint shader_program; // GL_CURRENT_PROGRAM |
| 160 | GLuint program_pipeline; // GL_PROGRAM_PIPELINE_BINDING | 159 | GLuint program_pipeline; // GL_PROGRAM_PIPELINE_BINDING |
| 161 | } draw; | 160 | } draw; |
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 235732d86..4947f06fd 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp | |||
| @@ -248,7 +248,6 @@ void RendererOpenGL::InitOpenGLObjects() { | |||
| 248 | 248 | ||
| 249 | state.draw.vertex_array = vertex_array.handle; | 249 | state.draw.vertex_array = vertex_array.handle; |
| 250 | state.draw.vertex_buffer = vertex_buffer.handle; | 250 | state.draw.vertex_buffer = vertex_buffer.handle; |
| 251 | state.draw.uniform_buffer = 0; | ||
| 252 | state.Apply(); | 251 | state.Apply(); |
| 253 | 252 | ||
| 254 | // Attach vertex data to VAO | 253 | // Attach vertex data to VAO |