diff options
| author | 2020-05-28 12:15:22 -0400 | |
|---|---|---|
| committer | 2020-05-28 12:15:22 -0400 | |
| commit | 099ac9c2a801115a9734833552286f1f804e4403 (patch) | |
| tree | e45122fb77153923eab2750eb0d09a1209198636 /src | |
| parent | Merge pull request #3954 from Morph1984/log-memory-amount (diff) | |
| parent | gl_shader_manager: Unbind GLSL program when binding a host pipeline (diff) | |
| download | yuzu-099ac9c2a801115a9734833552286f1f804e4403.tar.gz yuzu-099ac9c2a801115a9734833552286f1f804e4403.tar.xz yuzu-099ac9c2a801115a9734833552286f1f804e4403.zip | |
Merge pull request #3993 from ReinUsesLisp/fix-zla
gl_shader_manager: Unbind GLSL program when binding a host pipeline
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_manager.cpp | 4 |
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) { | |||
| 47 | old_state.geometry = 0; | 47 | old_state.geometry = 0; |
| 48 | glDisable(GL_GEOMETRY_PROGRAM_NV); | 48 | glDisable(GL_GEOMETRY_PROGRAM_NV); |
| 49 | } | 49 | } |
| 50 | } else { | ||
| 51 | if (!is_graphics_bound) { | ||
| 52 | glUseProgram(0); | ||
| 53 | } | ||
| 50 | } | 54 | } |
| 51 | glBindProgramPipeline(pipeline); | 55 | glBindProgramPipeline(pipeline); |
| 52 | } | 56 | } |