diff options
| author | bunnei <bunneidev@gmail.com> | 2020-03-11 13:51:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-11 13:51:54 -0400 |
| commit | fce33adcf1cb16bc308c39cd47b0a4e1aee68bf7 (patch) | |
| tree | 3eb7c0c781ff3ad5485134bcfe042c8533c67a02 /src/video_core/renderer_opengl/renderer_opengl.cpp | |
| parent | 503ebe9b960bd382bca967188b053b603ed33285 (diff) | |
| parent | 835790809954bb5962f8893320b8f5c3ad82d6a0 (diff) | |
Merge pull request #3494 from ReinUsesLisp/fix-cs-pipeline
gl_shader_manager: Fix interaction between graphics and compute
Diffstat (limited to 'src/video_core/renderer_opengl/renderer_opengl.cpp')
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index a51410660..c05677cd9 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -443,7 +443,6 @@ void RendererOpenGL::InitOpenGLObjects() { // Create program pipeline program_manager.Create(); - glBindProgramPipeline(program_manager.GetHandle()); // Generate VBO handle for drawing vertex_buffer.Create(); @@ -596,7 +595,7 @@ void RendererOpenGL::DrawScreen(const Layout::FramebufferLayout& layout) { program_manager.UseVertexShader(vertex_program.handle); program_manager.UseGeometryShader(0); program_manager.UseFragmentShader(fragment_program.handle); - program_manager.Update(); + program_manager.BindGraphicsPipeline(); glEnable(GL_CULL_FACE); if (screen_info.display_srgb) { |