diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-01-06 04:28:01 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-01-06 04:28:01 +0100 |
commit | ea4928393f164723e904cf2192a5b724f11ef844 (patch) | |
tree | 50722df05cd4acfffafaf30c0e65c644987e07d6 | |
parent | Merge pull request #1988 from lioncash/res (diff) | |
download | yuzu-ea4928393f164723e904cf2192a5b724f11ef844.tar yuzu-ea4928393f164723e904cf2192a5b724f11ef844.tar.gz yuzu-ea4928393f164723e904cf2192a5b724f11ef844.tar.bz2 yuzu-ea4928393f164723e904cf2192a5b724f11ef844.tar.lz yuzu-ea4928393f164723e904cf2192a5b724f11ef844.tar.xz yuzu-ea4928393f164723e904cf2192a5b724f11ef844.tar.zst yuzu-ea4928393f164723e904cf2192a5b724f11ef844.zip |
Diffstat (limited to '')
-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() { draw.draw_framebuffer = 0; draw.vertex_array = 0; draw.vertex_buffer = 0; - draw.uniform_buffer = 0; draw.shader_program = 0; draw.program_pipeline = 0; @@ -544,10 +543,6 @@ void OpenGLState::ApplyDepthClamp() const { void OpenGLState::Apply() const { ApplyFramebufferState(); ApplyVertexBufferState(); - // Uniform buffer - if (draw.uniform_buffer != cur_state.draw.uniform_buffer) { - glBindBuffer(GL_UNIFORM_BUFFER, draw.uniform_buffer); - } // Shader program if (draw.shader_program != cur_state.draw.shader_program) { @@ -642,9 +637,6 @@ OpenGLState& OpenGLState::ResetBuffer(GLuint handle) { if (draw.vertex_buffer == handle) { draw.vertex_buffer = 0; } - if (draw.uniform_buffer == handle) { - draw.uniform_buffer = 0; - } return *this; } 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: GLuint draw_framebuffer; // GL_DRAW_FRAMEBUFFER_BINDING GLuint vertex_array; // GL_VERTEX_ARRAY_BINDING GLuint vertex_buffer; // GL_ARRAY_BUFFER_BINDING - GLuint uniform_buffer; // GL_UNIFORM_BUFFER_BINDING GLuint shader_program; // GL_CURRENT_PROGRAM GLuint program_pipeline; // GL_PROGRAM_PIPELINE_BINDING } 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() { state.draw.vertex_array = vertex_array.handle; state.draw.vertex_buffer = vertex_buffer.handle; - state.draw.uniform_buffer = 0; state.Apply(); // Attach vertex data to VAO |