From dd4c0b039bcd38459cd5545d087c2b047198067b Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Thu, 29 Jul 2010 03:53:27 +0000 Subject: git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@55267 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- AUTHORS | 1 + ChangeLog | 3 +++ plugins/peopsxgl/draw.c | 9 ++------- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/AUTHORS b/AUTHORS index 8692f05c..1300bdee 100644 --- a/AUTHORS +++ b/AUTHORS @@ -27,6 +27,7 @@ PCSX-Reloaded Authors/Contributors: avlex (Help on xcode project) maggix (Snow Leopard compile fix) NeToU (Bugfix) Peter Collingbourne (Various core/psxbios fixes) + siveritas (Bugfix) shalma (GTE Divider, various core fixes) Tristin Celestin (PulseAudio support) Wei Mingzhi (Maintainer, input plugin, iso/cheat support, misc stuff) diff --git a/ChangeLog b/ChangeLog index e8816ba4..37328759 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,9 @@ July 29, 2010 Wei Mingzhi disc is really a PSX CD or not. * macosx/Pcsx.xcodeproj/project.pbxproj: Added DFInput to project. * macosx/plugins/HIDInput: Removed. + * plugins/peopsxgl/draw.c: Replaced global symbols with glXGetProcAddress + call (courtesy of siveritas). + * AUTHORS: Updated info. July 25, 2010 Wei Mingzhi diff --git a/plugins/peopsxgl/draw.c b/plugins/peopsxgl/draw.c index d0b70748..33381e59 100644 --- a/plugins/peopsxgl/draw.c +++ b/plugins/peopsxgl/draw.c @@ -74,11 +74,6 @@ #endif //////////////////////////////////////////////////////////////////////////////////// -// draw globals - -void glBlendEquationEXT(GLenum mode); -void glColorTableEXT(GLenum target, GLenum internalFormat, GLsizei width, GLenum format,GLenum type, const GLvoid *data); - // draw globals; most will be initialized again later (by config or checks) BOOL bIsFirstFrame=TRUE; @@ -175,7 +170,7 @@ void GetExtInfos(void) { iUsePalTextures=1; // -> wow, supported, get func pointer - glColorTableEXTEx=(PFNGLCOLORTABLEEXT)glColorTableEXT; + glColorTableEXTEx=(PFNGLCOLORTABLEEXT)glXGetProcAddress("glColorTableEXT"); if(glColorTableEXTEx==NULL) iUsePalTextures=0; // -> ha, cheater... no func, no support } @@ -201,7 +196,7 @@ void SetExtGLFuncs(void) strstr((char *)glGetString(GL_EXTENSIONS), // and blend_subtract available? "GL_EXT_blend_subtract")) { // -> get ogl blend function pointer - glBlendEquationEXTEx=(PFNGLBLENDEQU)glBlendEquationEXT; + glBlendEquationEXTEx=(PFNGLBLENDEQU)glXGetProcAddress("glBlendEquationEXT"); } else // no subtract blending? { -- cgit v1.2.3