summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2020-05-26 04:20:39 -0300
committerReinUsesLisp <reinuseslisp@airmail.cc>2020-05-26 04:20:39 -0300
commitc13e2f1b7504055472345af28fffcb28a0e771f2 (patch)
tree80253330ff289386499c66ca92cbbef8691a1807
parent86345c126acc80a6019abb9be77359f7e6bb0f27 (diff)
gl_shader_manager: Unbind GLSL program when binding a host pipeline
Fixes regression in Link's Awakening caused by 420cc13248350ef5c2d19e0b961cb4185cd16a8a
-rw-r--r--src/video_core/renderer_opengl/gl_shader_manager.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_manager.cpp b/src/video_core/renderer_opengl/gl_shader_manager.cpp
index 96605db84..8e754fa90 100644
--- a/src/video_core/renderer_opengl/gl_shader_manager.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_manager.cpp
@@ -47,6 +47,10 @@ void ProgramManager::BindHostPipeline(GLuint pipeline) {
old_state.geometry = 0;
glDisable(GL_GEOMETRY_PROGRAM_NV);
}
+ } else {
+ if (!is_graphics_bound) {
+ glUseProgram(0);
+ }
}
glBindProgramPipeline(pipeline);
}