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

SDL: Fix build for platforms with incomplete OpenGL headers

Browse source
This commit is contained in:
Bastien Bouclet 2016-06-12 20:08:05 +02:00
parent fe4aac9ada
commit 9c0950f76c
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
View file

@ -616,7 +616,7 @@ void SurfaceSdlGraphicsManager::drawSideTexturesOpenGL() {
} }
OpenGL::FrameBuffer *SurfaceSdlGraphicsManager::createFramebuffer(uint width, uint height) { OpenGL::FrameBuffer *SurfaceSdlGraphicsManager::createFramebuffer(uint width, uint height) {
#ifndef USE_GLES2 #if !defined(USE_GLES2) && !defined(AMIGAOS)
if (_antialiasing && OpenGLContext.framebufferObjectMultisampleSupported) { if (_antialiasing && OpenGLContext.framebufferObjectMultisampleSupported) {
return new OpenGL::MultiSampleFrameBuffer(width, height, _antialiasing); return new OpenGL::MultiSampleFrameBuffer(width, height, _antialiasing);
} else } else

10
graphics/opengl/system_headers.h
View file

@ -46,11 +46,6 @@
#define GL_UNPACK_ROW_LENGTH 0x0CF2 #define GL_UNPACK_ROW_LENGTH 0x0CF2
#endif #endif
#if !defined(GL_MAX_SAMPLES)
// The Android SDK does not declare GL_MAX_SAMPLES
#define GL_MAX_SAMPLES 0x8D57
#endif
#elif defined(USE_GLEW) #elif defined(USE_GLEW)
#include <GL/glew.h> #include <GL/glew.h>
#elif defined(SDL_BACKEND) && defined(USE_OPENGL) #elif defined(SDL_BACKEND) && defined(USE_OPENGL)
@ -60,3 +55,8 @@
#endif #endif
#endif #endif
#if !defined(GL_MAX_SAMPLES)
// The Android SDK and SDL1 don't declare GL_MAX_SAMPLES
#define GL_MAX_SAMPLES 0x8D57
#endif