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

OpenGL Renderer: 

- Fix compiling on OS X.
This commit is contained in:
rogerman 2013-01-17 09:14:06 +00:00
parent f3bbcfcd63
commit 4abb36899b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
desmume/src/OGLRender.cpp
View File

@ -257,7 +257,7 @@ OGLEXT(PFNGLFRAMEBUFFERTEXTURE2DEXTPROC,glFramebufferTexture2DEXT)
OGLEXT(PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC,glCheckFramebufferStatusEXT) OGLEXT(PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC,glCheckFramebufferStatusEXT)
OGLEXT(PFNGLDELETEFRAMEBUFFERSEXTPROC,glDeleteFramebuffersEXT) OGLEXT(PFNGLDELETEFRAMEBUFFERSEXTPROC,glDeleteFramebuffersEXT)
OGLEXT(PFNGLBLITFRAMEBUFFEREXTPROC,glBlitFramebufferEXT) OGLEXT(PFNGLBLITFRAMEBUFFEREXTPROC,glBlitFramebufferEXT)
// new stuff // Multisampled FBO
OGLEXT(PFNGLGENRENDERBUFFERSEXTPROC,glGenRenderbuffersEXT) OGLEXT(PFNGLGENRENDERBUFFERSEXTPROC,glGenRenderbuffersEXT)
OGLEXT(PFNGLBINDRENDERBUFFEREXTPROC,glBindRenderbufferEXT) OGLEXT(PFNGLBINDRENDERBUFFEREXTPROC,glBindRenderbufferEXT)
OGLEXT(PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC,glRenderbufferStorageMultisampleEXT) OGLEXT(PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC,glRenderbufferStorageMultisampleEXT)
@ -959,6 +959,11 @@ static char OGLInit(void)
INITOGLEXT(PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC,glCheckFramebufferStatusEXT) INITOGLEXT(PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC,glCheckFramebufferStatusEXT)
INITOGLEXT(PFNGLDELETEFRAMEBUFFERSEXTPROC,glDeleteFramebuffersEXT) INITOGLEXT(PFNGLDELETEFRAMEBUFFERSEXTPROC,glDeleteFramebuffersEXT)
INITOGLEXT(PFNGLBLITFRAMEBUFFEREXTPROC,glBlitFramebufferEXT) INITOGLEXT(PFNGLBLITFRAMEBUFFEREXTPROC,glBlitFramebufferEXT)
// Multisampled FBO
INITOGLEXT(PFNGLGENRENDERBUFFERSEXTPROC,glGenRenderbuffersEXT)
INITOGLEXT(PFNGLBINDRENDERBUFFEREXTPROC,glBindRenderbufferEXT)
INITOGLEXT(PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC,glRenderbufferStorageMultisampleEXT)
INITOGLEXT(PFNGLDELETERENDERBUFFERSEXTPROC,glDeleteRenderbuffersEXT)
#ifdef HAVE_LIBOSMESA #ifdef HAVE_LIBOSMESA
glBlendFuncSeparate = NULL; glBlendFuncSeparate = NULL;
#else #else
@ -975,12 +980,6 @@ static char OGLInit(void)
INITOGLEXT(PFNGLACTIVETEXTUREPROC,glActiveTexture) INITOGLEXT(PFNGLACTIVETEXTUREPROC,glActiveTexture)
#endif #endif
//new stuff
INITOGLEXT(PFNGLGENRENDERBUFFERSEXTPROC,glGenRenderbuffersEXT)
INITOGLEXT(PFNGLBINDRENDERBUFFEREXTPROC,glBindRenderbufferEXT)
INITOGLEXT(PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC,glRenderbufferStorageMultisampleEXT)
INITOGLEXT(PFNGLDELETERENDERBUFFERSEXTPROC,glDeleteRenderbuffersEXT)
// VBO Setup // VBO Setup
#if !defined(GL_ARB_vertex_buffer_object) #if !defined(GL_ARB_vertex_buffer_object)
isVBOSupported = false; isVBOSupported = false;