[Scummvm-git-logs] scummvm master -> f2a7b582a94f2b26c3e72e9d915cf1c68a0cae6f

[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:
f2a7b582a9 WINTERMUTE: Switch back to glActiveTexture


Commit: f2a7b582a94f2b26c3e72e9d915cf1c68a0cae6f
    https://github.com/scummvm/scummvm/commit/f2a7b582a94f2b26c3e72e9d915cf1c68a0cae6f
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2020-10-11T20:42:40+02:00

Commit Message:
WINTERMUTE: Switch back to glActiveTexture

Changed paths:
    engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp


diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index a7ba20dcb3..aa412172f9 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -477,8 +477,10 @@ bool BaseRenderOpenGL3D::setup2D(bool force) {
 
 #if defined(__MINGW32__) && defined (SDL_BACKEND) && !defined(USE_GLEW)
 		glActiveTexturePtr(GL_TEXTURE0);
-#else
+#elif defined(__MORPHOS__)
 		glActiveTextureARB(GL_TEXTURE0);
+#else
+		glActiveTexture(GL_TEXTURE0);
 #endif
 		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
 		glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
@@ -490,15 +492,19 @@ bool BaseRenderOpenGL3D::setup2D(bool force) {
 
 #if defined(__MINGW32__) && defined (SDL_BACKEND) && !defined(USE_GLEW)
 		glActiveTexturePtr(GL_TEXTURE1);
-#else
+#elif defined(__MORPHOS__)
 		glActiveTextureARB(GL_TEXTURE1);
+#else
+		glActiveTexture(GL_TEXTURE1);
 #endif
 		glDisable(GL_TEXTURE_2D);
 
 #if defined(__MINGW32__) && defined (SDL_BACKEND) && !defined(USE_GLEW)
 		glActiveTexturePtr(GL_TEXTURE0);
-#else
+#elif defined(__MORPHOS__)
 		glActiveTextureARB(GL_TEXTURE0);
+#else
+		glActiveTexture(GL_TEXTURE0);
 #endif
 		
 		glViewport(0, 0, _width, _height);