From 3c87d8b2682ebef8addf7bf8e4121325bcfbfe97 Mon Sep 17 00:00:00 2001 From: rogerman Date: Wed, 6 Feb 2019 10:23:17 -0800 Subject: [PATCH] OpenGL Renderer: In GLX, there is no need to load glBlendEquation(), which is an OpenGL v1.2 function, since the current version of GLX (v1.4, circa 2005) implicitly supports OpenGL v1.3. Fixes #254. (Regression from commit ef3e93b.) --- desmume/src/OGLRender.cpp | 8 ++++++-- desmume/src/OGLRender.h | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp index 7a8fd5e2b..ed15562af 100755 --- a/desmume/src/OGLRender.cpp +++ b/desmume/src/OGLRender.cpp @@ -158,7 +158,9 @@ OGLEXT(PFNGLACTIVETEXTUREARBPROC, glActiveTextureARB) #endif // Blending +#if !defined(GLX_H) OGLEXT(PFNGLBLENDEQUATIONPROC, glBlendEquation) // Core in v1.2 +#endif OGLEXT(PFNGLBLENDFUNCSEPARATEPROC, glBlendFuncSeparate) // Core in v1.4 OGLEXT(PFNGLBLENDEQUATIONSEPARATEPROC, glBlendEquationSeparate) // Core in v2.0 @@ -234,13 +236,15 @@ OGLEXT(PFNGLDELETERENDERBUFFERSEXTPROC, glDeleteRenderbuffersEXT) static void OGLLoadEntryPoints_Legacy() { // Textures - #if !defined(GLX_H) +#if !defined(GLX_H) INITOGLEXT(PFNGLACTIVETEXTUREPROC, glActiveTexture) // Core in v1.3 INITOGLEXT(PFNGLACTIVETEXTUREARBPROC, glActiveTextureARB) - #endif +#endif // Blending +#if !defined(GLX_H) INITOGLEXT(PFNGLBLENDEQUATIONPROC, glBlendEquation) // Core in v1.2 +#endif INITOGLEXT(PFNGLBLENDFUNCSEPARATEPROC, glBlendFuncSeparate) // Core in v1.4 INITOGLEXT(PFNGLBLENDEQUATIONSEPARATEPROC, glBlendEquationSeparate) // Core in v2.0 diff --git a/desmume/src/OGLRender.h b/desmume/src/OGLRender.h index c859b6fcf..ee37e1ddd 100755 --- a/desmume/src/OGLRender.h +++ b/desmume/src/OGLRender.h @@ -105,7 +105,9 @@ EXTERNOGLEXT(PFNGLACTIVETEXTUREARBPROC, glActiveTextureARB) #endif // Blending +#if !defined(GLX_H) EXTERNOGLEXT(PFNGLBLENDEQUATIONPROC, glBlendEquation) // Core in v1.2 +#endif EXTERNOGLEXT(PFNGLBLENDFUNCSEPARATEPROC, glBlendFuncSeparate) // Core in v1.4 EXTERNOGLEXT(PFNGLBLENDEQUATIONSEPARATEPROC, glBlendEquationSeparate) // Core in v2.0 @@ -195,7 +197,9 @@ EXTERNOGLEXT(PFNGLACTIVETEXTUREPROC, glActiveTexture) // Core in v1.3 #endif // Blending +#if !defined(GLX_H) EXTERNOGLEXT(PFNGLBLENDEQUATIONPROC, glBlendEquation) // Core in v1.2 +#endif EXTERNOGLEXT(PFNGLBLENDFUNCSEPARATEPROC, glBlendFuncSeparate) // Core in v1.4 EXTERNOGLEXT(PFNGLBLENDEQUATIONSEPARATEPROC, glBlendEquationSeparate) // Core in v2.0