[Scummvm-git-logs] scummvm master -> 6b140534529f5802dd75a473f7946440245792e4

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6b14053452 STARK: Reset array buffer in OpenGL renderer


Commit: 6b140534529f5802dd75a473f7946440245792e4
    https://github.com/scummvm/scummvm/commit/6b140534529f5802dd75a473f7946440245792e4
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-10-19T20:42:20+02:00

Commit Message:
STARK: Reset array buffer in OpenGL renderer

Changed paths:
    engines/stark/gfx/opengl.cpp


diff --git a/engines/stark/gfx/opengl.cpp b/engines/stark/gfx/opengl.cpp
index 4b5eaaf12e..89811b9969 100644
--- a/engines/stark/gfx/opengl.cpp
+++ b/engines/stark/gfx/opengl.cpp
@@ -222,6 +222,11 @@ FadeRenderer *OpenGLDriver::createFadeRenderer() {
 }
 
 void OpenGLDriver::start2DMode() {
+#if defined(USE_OPENGL_SHADERS)
+	// The ShaderSurfaceRenderer sets an array buffer which conflict with fixed pipeline rendering
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+#endif // defined(USE_OPENGL_SHADERS)
+
 	// Enable alpha blending
 	glEnable(GL_BLEND);
 	//glBlendEquation(GL_FUNC_ADD); // It's the default
@@ -246,6 +251,11 @@ void OpenGLDriver::end2DMode() {
 }
 
 void OpenGLDriver::set3DMode() {
+#if defined(USE_OPENGL_SHADERS)
+	// The ShaderSurfaceRenderer sets an array buffer which conflict with fixed pipeline rendering
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+#endif // defined(USE_OPENGL_SHADERS)
+
 	glEnable(GL_DEPTH_TEST);
 	glDepthFunc(GL_LESS);