thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OPENGL: Fix building the SDL backend with USE_GLES2

Browse source
This commit is contained in:
Bastien Bouclet 2016-02-06 08:41:39 +01:00
parent b5dcf5d4bc
commit 22006859f9
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
graphics/opengl/framebuffer.cpp
View file

@ -24,9 +24,7 @@
#if defined(USE_OPENGL) && !defined(AMIGAOS) #if defined(USE_OPENGL) && !defined(AMIGAOS)
#ifdef USE_OPENGL_SHADERS #if defined(SDL_BACKEND) && !defined(USE_GLEW) && !defined(USE_GLES2)
#include "graphics/opengl/framebuffer.h"
#elif defined(SDL_BACKEND)
#define GL_GLEXT_PROTOTYPES // For the GL_EXT_framebuffer_object extension #define GL_GLEXT_PROTOTYPES // For the GL_EXT_framebuffer_object extension
#include "graphics/opengl/framebuffer.h" #include "graphics/opengl/framebuffer.h"
#ifndef GL_ARB_framebuffer_object #ifndef GL_ARB_framebuffer_object
@ -40,7 +38,9 @@
#define GL_DEPTH24_STENCIL8 0x88F0 #define GL_DEPTH24_STENCIL8 0x88F0
#endif #endif
#include "backends/platform/sdl/sdl-sys.h" #include "backends/platform/sdl/sdl-sys.h"
#endif // defined(SDL_BACKEND) #else
#include "graphics/opengl/framebuffer.h"
#endif
#include "graphics/opengl/context.h" #include "graphics/opengl/context.h"
@ -50,7 +50,7 @@
namespace OpenGL { namespace OpenGL {
#if defined(SDL_BACKEND) && !defined(USE_GLEW) #if defined(SDL_BACKEND) && !defined(USE_GLEW) && !defined(USE_GLES2)
static bool framebuffer_object_functions = false; static bool framebuffer_object_functions = false;
static PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebuffer; static PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebuffer;
static PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbuffer; static PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbuffer;
@ -96,7 +96,7 @@ static void grabFramebufferObjectPointers() {
u.obj_ptr = SDL_GL_GetProcAddress("glRenderbufferStorage"); u.obj_ptr = SDL_GL_GetProcAddress("glRenderbufferStorage");
glRenderbufferStorage = (PFNGLRENDERBUFFERSTORAGEEXTPROC)u.func_ptr; glRenderbufferStorage = (PFNGLRENDERBUFFERSTORAGEEXTPROC)u.func_ptr;
} }
#endif // defined(SDL_BACKEND) && !defined(USE_OPENGL_SHADERS) #endif // defined(SDL_BACKEND) && !defined(USE_GLES2)
@ -106,12 +106,11 @@ static bool usePackedBuffer() {
FrameBuffer::FrameBuffer(uint width, uint height) : FrameBuffer::FrameBuffer(uint width, uint height) :
Texture(width, height) { Texture(width, height) {
#ifdef SDL_BACKEND
if (!OpenGLContext.framebufferObjectSupported) { if (!OpenGLContext.framebufferObjectSupported) {
error("GL_EXT_framebuffer_object extension is not supported!"); error("FrameBuffer Objects are not supported by the current OpenGL context");
} }
#endif
#if defined(SDL_BACKEND) && !defined(USE_GLEW) #if defined(SDL_BACKEND) && !defined(USE_GLEW) && !defined(USE_GLES2)
grabFramebufferObjectPointers(); grabFramebufferObjectPointers();
#endif #endif