ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation for linux, I guess it's still broke 

on mac. (AFAIK, there's no need for *GetProcAddress on
mac)
This commit is contained in:
yabause 2008-12-05 22:50:45 +00:00
parent 330bbccb08
commit 0c46504c2a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
desmume/src/OGLRender.cpp
View File

@ -112,7 +112,8 @@ static bool isTranslucent;
#ifdef _WIN32
#define INITOGLEXT(x,y) y = (x)wglGetProcAddress(#y);
#else
#define INITOGLEXT(x,y) y = (x)glXGetProcAddress(#y);
#include <GL/glx.h>
#define INITOGLEXT(x,y) y = (x)glXGetProcAddress((const GLubyte *) #y);
#endif
OGLEXT(PFNGLCREATESHADERPROC,glCreateShader)
@ -133,7 +134,9 @@ OGLEXT(PFNGLVALIDATEPROGRAMPROC,glValidateProgram)
OGLEXT(PFNGLBLENDFUNCSEPARATEEXTPROC,glBlendFuncSeparateEXT)
OGLEXT(PFNGLGETUNIFORMLOCATIONPROC,glGetUniformLocation)
OGLEXT(PFNGLUNIFORM1IPROC,glUniform1i)
#ifdef _WIN32
OGLEXT(PFNGLACTIVETEXTUREPROC,glActiveTexture)
#endif
//opengl state caching:
@ -411,7 +414,9 @@ static char Init(void)
INITOGLEXT(PFNGLBLENDFUNCSEPARATEEXTPROC,glBlendFuncSeparateEXT)
INITOGLEXT(PFNGLGETUNIFORMLOCATIONPROC,glGetUniformLocation)
INITOGLEXT(PFNGLUNIFORM1IPROC,glUniform1i)
#ifdef _WIN32
INITOGLEXT(PFNGLACTIVETEXTUREPROC,glActiveTexture)
#endif
/* Create the shaders */
createShaders();