libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-27 11:20:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BACKENDS: Attempt to fix buildbot targets

Browse Source
This commit is contained in:
Paweł Kołodziejski 2020-10-14 07:06:18 +02:00
parent 24e1c8008c
commit e3cd0da0df
7 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backends/platform/sdl/sdl.cpp
View File

@ -49,11 +49,12 @@
#include "backends/mutex/sdl/sdl-mutex.h"
#include "backends/timer/sdl/sdl-timer.h"
#include "backends/graphics/surfacesdl/surfacesdl-graphics.h"
#include "backends/graphics3d/sdl/sdl-graphics3d.h"
#ifdef USE_OPENGL
#include "backends/graphics/openglsdl/openglsdl-graphics.h"
#include "graphics/cursorman.h"
#endif
#ifdef USE_OPENGL_GAME
#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "backends/graphics3d/openglsdl/openglsdl-graphics3d.h"
#include "graphics/opengl/context.h"
#endif
@ -305,7 +306,7 @@ void OSystem_SDL::initBackend() {
}
}
#ifdef USE_OPENGL_GAME
#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
void OSystem_SDL::detectFramebufferSupport() {
_capabilities.openGLFrameBuffer = false;
#if defined(USE_GLES2)
@ -381,7 +382,7 @@ void OSystem_SDL::detectAntiAliasingSupport() {
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
}
#endif // USE_OPENGL_GAME
#endif // defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)
void OSystem_SDL::engineInit() {
#if SDL_VERSION_ATLEAST(2, 0, 0)
@ -487,7 +488,7 @@ void OSystem_SDL::setWindowCaption(const char *caption) {
_window->setWindowCaption(cap);
}
#ifdef USE_OPENGL_GAME
#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
Common::Array<uint> OSystem_SDL::getSupportedAntiAliasingLevels() const {
return _capabilities.openGLAntiAliasLevels;
}
@ -783,8 +784,7 @@ bool OSystem_SDL::setGraphicsMode(int mode, uint flags) {
sdlGraphicsManager->deactivateManager();
delete sdlGraphicsManager;
}
#ifdef USE_OPENGL_GAME
#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
if (!dynamic_cast<OpenGLSdlGraphics3dManager *>(sdlGraphics3dManager)) {
if (sdlGraphics3dManager) {
sdlGraphics3dManager->deactivateManager();

2
configure vendored
View File

@ -5418,7 +5418,6 @@ EOF
for lib in "-lGLESv2" "-logles2"; do
if cc_check_no_clean $DEFINES $OPENGL_CFLAGS $OPENGL_LIBS $lib
then
_opengl_game=yes
_opengles2=yes
append_var OPENGL_LIBS "$lib"
break
@ -5461,6 +5460,7 @@ fi
# If 2d sdl gfx backend has no opengl we will not enable opengl in games due lack of gfx dynamic switch
if test "$_opengl" = "no" ; then
_opengl_game=no
_opengl_shaders=no
_opengles2=no
_glew=no
fi

2
graphics/opengl/framebuffer.cpp
View File

@ -23,7 +23,7 @@
#include "common/textconsole.h"
#include "common/util.h"
#if defined(USE_OPENGL_GAME) && !defined(AMIGAOS) && !defined(__MORPHOS__)
#if (defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)) && !defined(AMIGAOS) && !defined(__MORPHOS__)
#if defined(SDL_BACKEND) && !defined(USE_GLEW) && !defined(USE_GLES2)
#define GL_GLEXT_PROTOTYPES // For the GL_EXT_framebuffer_object extension

2
graphics/opengl/surfacerenderer.cpp
View File

@ -22,7 +22,7 @@
#include "common/scummsys.h"
#if defined(USE_OPENGL_GAME)
#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "graphics/opengl/surfacerenderer.h"

3
graphics/opengl/texture.cpp
View File

@ -22,12 +22,11 @@
#include "common/textconsole.h"
#if defined(USE_OPENGL_GAME)
#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "graphics/opengl/texture.h"
#include "graphics/opengl/context.h"
namespace OpenGL {
template<class T>

2
graphics/opengl/tiledsurface.cpp
View File

@ -22,7 +22,7 @@
#include "common/textconsole.h"
#if defined(USE_OPENGL_GAME)
#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "graphics/opengl/tiledsurface.h"

2
graphics/renderer.cpp
View File

@ -27,7 +27,7 @@
namespace Graphics {
static const RendererTypeDescription rendererTypes[] = {
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME)
{ "opengl", _s("OpenGL"), kRendererTypeOpenGL },
#endif
#if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)