From 4abb36899bb117a1be636104079b71cea10458b6 Mon Sep 17 00:00:00 2001 From: rogerman Date: Thu, 17 Jan 2013 09:14:06 +0000 Subject: [PATCH] OpenGL Renderer: - Fix compiling on OS X. --- desmume/src/OGLRender.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp index 60514133b..711d9a93b 100644 --- a/desmume/src/OGLRender.cpp +++ b/desmume/src/OGLRender.cpp @@ -257,7 +257,7 @@ OGLEXT(PFNGLFRAMEBUFFERTEXTURE2DEXTPROC,glFramebufferTexture2DEXT) OGLEXT(PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC,glCheckFramebufferStatusEXT) OGLEXT(PFNGLDELETEFRAMEBUFFERSEXTPROC,glDeleteFramebuffersEXT) OGLEXT(PFNGLBLITFRAMEBUFFEREXTPROC,glBlitFramebufferEXT) -// new stuff +// Multisampled FBO OGLEXT(PFNGLGENRENDERBUFFERSEXTPROC,glGenRenderbuffersEXT) OGLEXT(PFNGLBINDRENDERBUFFEREXTPROC,glBindRenderbufferEXT) OGLEXT(PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC,glRenderbufferStorageMultisampleEXT) @@ -959,6 +959,11 @@ static char OGLInit(void) INITOGLEXT(PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC,glCheckFramebufferStatusEXT) INITOGLEXT(PFNGLDELETEFRAMEBUFFERSEXTPROC,glDeleteFramebuffersEXT) INITOGLEXT(PFNGLBLITFRAMEBUFFEREXTPROC,glBlitFramebufferEXT) + // Multisampled FBO + INITOGLEXT(PFNGLGENRENDERBUFFERSEXTPROC,glGenRenderbuffersEXT) + INITOGLEXT(PFNGLBINDRENDERBUFFEREXTPROC,glBindRenderbufferEXT) + INITOGLEXT(PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC,glRenderbufferStorageMultisampleEXT) + INITOGLEXT(PFNGLDELETERENDERBUFFERSEXTPROC,glDeleteRenderbuffersEXT) #ifdef HAVE_LIBOSMESA glBlendFuncSeparate = NULL; #else @@ -974,12 +979,6 @@ static char OGLInit(void) #if !defined(GL_VERSION_1_3) || defined(_MSC_VER) || defined(__INTEL_COMPILER) INITOGLEXT(PFNGLACTIVETEXTUREPROC,glActiveTexture) #endif - - //new stuff - INITOGLEXT(PFNGLGENRENDERBUFFERSEXTPROC,glGenRenderbuffersEXT) - INITOGLEXT(PFNGLBINDRENDERBUFFEREXTPROC,glBindRenderbufferEXT) - INITOGLEXT(PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC,glRenderbufferStorageMultisampleEXT) - INITOGLEXT(PFNGLDELETERENDERBUFFERSEXTPROC,glDeleteRenderbuffersEXT) // VBO Setup #if !defined(GL_ARB_vertex_buffer_object)