From 45cff83b7112f19bb183ddd39ed5781236f9f738 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 24 Feb 2007 23:19:07 +0000 Subject: [PATCH] glBlendFuncSeparateEXT (since that's waht we test for) --- stepmania/src/RageDisplay_OGL.cpp | 4 ++-- stepmania/src/RageDisplay_OGL_Helpers.cpp | 2 +- stepmania/src/RageDisplay_OGL_Helpers.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index 88ba5e57e0..79225c5e23 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -1645,8 +1645,8 @@ void RageDisplay_OGL::SetBlendMode( BlendMode mode ) DEFAULT_FAIL( mode ); } - if( GLExt.glBlendFuncSeparate != NULL ) - GLExt.glBlendFuncSeparate( iSourceRGB, iDestRGB, iSourceAlpha, iDestAlpha ); + if( GLExt.glBlendFuncSeparateEXT != NULL ) + GLExt.glBlendFuncSeparateEXT( iSourceRGB, iDestRGB, iSourceAlpha, iDestAlpha ); else glBlendFunc( iSourceRGB, iDestRGB ); } diff --git a/stepmania/src/RageDisplay_OGL_Helpers.cpp b/stepmania/src/RageDisplay_OGL_Helpers.cpp index 3aac564c70..9757f18f59 100644 --- a/stepmania/src/RageDisplay_OGL_Helpers.cpp +++ b/stepmania/src/RageDisplay_OGL_Helpers.cpp @@ -130,7 +130,7 @@ void GLExt_t::Load( LowLevelWindow *pWind ) } if( HasExtension("GL_EXT_blend_func_separate") ) - glBlendFuncSeparate = (PFNGLBLENDFUNCSEPARATEPROC) pWind->GetProcAddress("glBlendFuncSeparate"); + glBlendFuncSeparateEXT = (PFNGLBLENDFUNCSEPARATEEXTPROC) pWind->GetProcAddress("glBlendFuncSeparateEXT"); if( HasExtension("GL_EXT_blend_subtract") ) glBlendEquation = (PFNGLBLENDEQUATIONPROC) pWind->GetProcAddress("glBlendEquation"); diff --git a/stepmania/src/RageDisplay_OGL_Helpers.h b/stepmania/src/RageDisplay_OGL_Helpers.h index 2deedc5c6d..803d91b5db 100644 --- a/stepmania/src/RageDisplay_OGL_Helpers.h +++ b/stepmania/src/RageDisplay_OGL_Helpers.h @@ -69,7 +69,7 @@ struct GLExt_t PWSWAPINTERVALEXTPROC wglSwapIntervalEXT; PFNGLCOLORTABLEPROC glColorTableEXT; - PFNGLBLENDFUNCSEPARATEPROC glBlendFuncSeparate; + PFNGLBLENDFUNCSEPARATEEXTPROC glBlendFuncSeparateEXT; PFNGLBLENDEQUATIONPROC glBlendEquation; PFNGLCOLORTABLEPARAMETERIVPROC glGetColorTableParameterivEXT; PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;