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

ALL: Separate USE_OPENGL and USE_OPENG_GAME. Exclude WME3D for GLES2 for now.

Browse source
This commit is contained in:
Paweł Kołodziejski 2020-10-10 14:12:07 +02:00
parent e20bddb738
commit 264f6f037b
46 changed files with 86 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backends/module.mk
View file

@ -157,7 +157,11 @@ endif
ifdef USE_OPENGL
MODULE_OBJS += \
graphics/openglsdl/openglsdl-graphics.o \
graphics/openglsdl/openglsdl-graphics.o
endif
ifdef USE_OPENGL_GAME
MODULE_OBJS += \
graphics3d/openglsdl/openglsdl-graphics3d.o
endif

17
backends/platform/sdl/sdl.cpp
View file

@ -52,9 +52,11 @@
#include "backends/graphics3d/surfacesdl/surfacesdl-graphics3d.h"
#ifdef USE_OPENGL
#include "backends/graphics/openglsdl/openglsdl-graphics.h"
#include "graphics/cursorman.h"
#endif
#ifdef USE_OPENGL_GAME
#include "backends/graphics3d/openglsdl/openglsdl-graphics3d.h"
#include "graphics/opengl/context.h"
#include "graphics/cursorman.h"
#endif
#include "graphics/renderer.h"
@ -214,7 +216,7 @@ void OSystem_SDL::initBackend() {
#endif
debug(1, "Using SDL Video Driver \"%s\"", sdlDriverName);
#ifdef USE_OPENGL
#ifdef USE_OPENGL_GAME
detectFramebufferSupport();
detectAntiAliasingSupport();
#endif
@ -304,7 +306,7 @@ void OSystem_SDL::initBackend() {
}
}
#ifdef USE_OPENGL
#ifdef USE_OPENGL_GAME
void OSystem_SDL::detectFramebufferSupport() {
_capabilities.openGLFrameBuffer = false;
#if defined(USE_GLES2)
@ -380,7 +382,7 @@ void OSystem_SDL::detectAntiAliasingSupport() {
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
}
#endif // USE_OPENGL
#endif // USE_OPENGL_GAME
void OSystem_SDL::engineInit() {
#if SDL_VERSION_ATLEAST(2, 0, 0)
@ -486,7 +488,7 @@ void OSystem_SDL::setWindowCaption(const char *caption) {
_window->setWindowCaption(cap);
}
#ifdef USE_OPENGL
#ifdef USE_OPENGL_GAME
Common::Array<uint> OSystem_SDL::getSupportedAntiAliasingLevels() const {
return _capabilities.openGLAntiAliasLevels;
}
@ -784,6 +786,7 @@ bool OSystem_SDL::setGraphicsMode(int mode, uint flags) {
delete sdlGraphicsManager;
}
#ifdef USE_OPENGL_GAME
if (accel3d && !dynamic_cast<OpenGLSdlGraphics3dManager *>(sdlGraphics3dManager)) {
if (sdlGraphics3dManager) {
sdlGraphics3dManager->deactivateManager();
@ -794,7 +797,9 @@ bool OSystem_SDL::setGraphicsMode(int mode, uint flags) {
if (sdlGraphicsManager)
sdlGraphics3dManager->setDefaultFeatureState();
switchedManager = true;
} else if (!accel3d && !dynamic_cast<SurfaceSdlGraphics3dManager *>(sdlGraphics3dManager)) {
} else
#endif
if (!accel3d && !dynamic_cast<SurfaceSdlGraphics3dManager *>(sdlGraphics3dManager)) {
if (sdlGraphics3dManager) {
sdlGraphics3dManager->deactivateManager();
delete sdlGraphics3dManager;

6
backends/platform/sdl/sdl.h
View file

@ -36,7 +36,7 @@
#ifdef USE_DISCORD
class DiscordPresence;
#endif
#ifdef USE_OPENGL
#ifdef USE_OPENGL_GAME
#include "backends/graphics3d/openglsdl/openglsdl-graphics3d.h"
#endif
@ -90,7 +90,7 @@ public:
//Screenshots
virtual Common::String getScreenshotsPath();
#ifdef USE_OPENGL
#ifdef USE_OPENGL_GAME
Common::Array<uint> getSupportedAntiAliasingLevels() const override;
#endif
@ -128,7 +128,7 @@ protected:
SdlGraphicsManager::State _gfxManagerState;
#ifdef USE_OPENGL
#ifdef USE_OPENGL_GAME
// Graphics capabilities
void detectFramebufferSupport();
void detectAntiAliasingSupport();

6
configure vendored
View file

@ -5459,9 +5459,8 @@ EOF
cc_check_clean
fi
# Make sure both flags are synced to proper compile with USE_OPENGL
if test "$_opengl" = "no" || test "$_opengl_game" = "no" ; then
_opengl=no
# 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
_opengles2=no
_glew=no
@ -5480,6 +5479,7 @@ else
fi
define_in_config_if_yes "$_opengl" "USE_OPENGL"
define_in_config_if_yes "$_opengl_game" "USE_OPENGL_GAME"
define_in_config_if_yes "$_opengles2" "USE_GLES2"
define_in_config_if_yes "$_opengl_shaders" "USE_OPENGL_SHADERS"

5
devtools/create_project/create_project.cpp
View file

@ -1053,8 +1053,9 @@ const Feature s_features[] = {
{ "lua", "USE_LUA", false, true, "lua" },
{ "nasm", "USE_NASM", false, true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling.
{ "opengl", "USE_OPENGL", false, true, "OpenGL support" },
{ "openglshaders", "USE_OPENGL_SHADERS", false, true, "OpenGL support (shaders)" },
{ "opengles", "USE_GLES", false, true, "forced OpenGL ES mode" },
{ "opengl_game", "USE_OPENGL_GAME", false, true, "OpenGL support in 3d games" },
{ "opengl_shaders", "USE_OPENGL_SHADERS", false, true, "OpenGL support (shaders) in 3d games" },
{ "opengles", "USE_GLES", false, true, "forced OpenGL ES mode in 3d games" },
{ "taskbar", "USE_TASKBAR", false, true, "Taskbar integration support" },
{ "cloud", "USE_CLOUD", false, true, "Cloud integration support" },
{ "translation", "USE_TRANSLATION", false, true, "Translation support" },

4
engines/grim/gfx_base.cpp
View file

@ -109,12 +109,12 @@ void GfxBase::drawMesh(const Mesh *mesh) {
mesh->_faces[i].draw(mesh);
}
#ifndef USE_OPENGL
#ifndef USE_OPENGL_GAME
// Allow CreateGfxOpenGL to be called even if OpenGL isn't included
GfxBase *CreateGfxOpenGL() {
return CreateGfxTinyGL();
}
#endif // USE_OPENGL
#endif // USE_OPENGL_GAME
Math::Matrix4 GfxBase::makeLookMatrix(const Math::Vector3d& pos, const Math::Vector3d& interest, const Math::Vector3d& up) {
Math::Vector3d f = (interest - pos).getNormalized();

2
engines/grim/gfx_opengl.cpp
View file

@ -24,7 +24,7 @@
#include "common/system.h"
#include "common/config-manager.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#include "graphics/surface.h"
#include "graphics/pixelbuffer.h"

2
engines/grim/gfx_opengl.h
View file

@ -25,7 +25,7 @@
#include "engines/grim/gfx_base.h"
#ifdef USE_OPENGL
#ifdef USE_OPENGL_GAME
#ifdef USE_GLEW
#include <GL/glew.h>

6
engines/grim/grim.cpp
View file

@ -41,7 +41,7 @@
#include "graphics/pixelbuffer.h"
#include "graphics/renderer.h"
#ifdef USE_OPENGL
#ifdef USE_OPENGL_GAME
#include "graphics/opengl/context.h"
#endif
@ -271,7 +271,7 @@ GfxBase *GrimEngine::createRenderer(int screenW, int screenH, bool fullscreen) {
_softRenderer = matchingRendererType == Graphics::kRendererTypeTinyGL;
initGraphics3d(screenW, screenH, fullscreen, !_softRenderer);
#if defined(USE_OPENGL)
#if defined(USE_OPENGL_GAME)
// Check the OpenGL context actually supports shaders
if (matchingRendererType == Graphics::kRendererTypeOpenGLShaders && !OpenGLContext.shadersSupported) {
matchingRendererType = Graphics::kRendererTypeOpenGL;
@ -289,7 +289,7 @@ GfxBase *GrimEngine::createRenderer(int screenW, int screenH, bool fullscreen) {
renderer = CreateGfxOpenGLShader();
}
#endif
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
if (matchingRendererType == Graphics::kRendererTypeOpenGL) {
renderer = CreateGfxOpenGL();
}

6
engines/myst3/gfx.cpp
View file

@ -29,7 +29,7 @@
#include "graphics/renderer.h"
#include "graphics/surface.h"
#ifdef USE_OPENGL
#ifdef USE_OPENGL_GAME
#include "graphics/opengl/context.h"
#endif
@ -206,7 +206,7 @@ Renderer *createRenderer(OSystem *system) {
initGraphics3d(width, height, fullscreen, isAccelerated);
#if defined(USE_OPENGL)
#if defined(USE_OPENGL_GAME)
// Check the OpenGL context actually supports shaders
if (matchingRendererType == Graphics::kRendererTypeOpenGLShaders && !OpenGLContext.shadersSupported) {
matchingRendererType = Graphics::kRendererTypeOpenGL;
@ -223,7 +223,7 @@ Renderer *createRenderer(OSystem *system) {
return CreateGfxOpenGLShader(system);
}
#endif
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
if (matchingRendererType == Graphics::kRendererTypeOpenGL) {
return CreateGfxOpenGL(system);
}

2
engines/myst3/gfx_opengl.cpp
View file

@ -23,7 +23,7 @@
#include "common/rect.h"
#include "common/textconsole.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#include "graphics/colormasks.h"
#include "graphics/opengl/context.h"

2
engines/myst3/gfx_opengl_texture.cpp
View file

@ -22,7 +22,7 @@
#include "common/scummsys.h"
#if defined(USE_OPENGL) || defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_GAME) || defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#include "engines/myst3/gfx_opengl_texture.h"

2
engines/stark/gfx/driver.cpp
View file

@ -26,7 +26,7 @@
#include "common/config-manager.h"
#include "graphics/surface.h"
#ifdef USE_OPENGL
#ifdef USE_OPENGL_GAME
#include "graphics/opengl/context.h"
#endif

4
engines/wintermute/base/base_game.cpp
View file

@ -505,12 +505,12 @@ bool BaseGame::initialize2() { // we know whether we are going to be accelerated
Common::String rendererConfig = ConfMan.get("renderer");
Graphics::RendererType desiredRendererType = Graphics::parseRendererTypeCode(rendererConfig);
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_SHADERS)
if (desiredRendererType == Graphics::kRendererTypeOpenGLShaders) {
_renderer3D = makeOpenGL3DShaderRenderer(this);
}
#endif // defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
if (desiredRendererType == Graphics::kRendererTypeOpenGL) {
_renderer3D = makeOpenGL3DRenderer(this);
}

2
engines/wintermute/base/gfx/base_renderer3d.h
View file

@ -32,7 +32,7 @@
#include "math/matrix4.h"
#include "math/ray.h"
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_SHADERS)
#include "graphics/opengl/system_headers.h"
#include "graphics/opengl/texture.h"

6
engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
View file

@ -29,7 +29,7 @@
#include "graphics/opengl/system_headers.h"
#include "math/glmath.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"
@ -241,7 +241,7 @@ void BaseRenderOpenGL3D::setWindowed(bool windowed) {
}
void BaseRenderOpenGL3D::fadeToColor(byte r, byte g, byte b, byte a) {
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_SHADERS)
glBindBuffer(GL_ARRAY_BUFFER, 0);
#endif // defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
@ -612,7 +612,7 @@ bool BaseRenderOpenGL3D::drawSpriteEx(BaseSurfaceOpenGL3D &tex, const Wintermute
// The ShaderSurfaceRenderer sets an array buffer which appearently conflicts with us
// Reset it!
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_SHADERS)
glBindBuffer(GL_ARRAY_BUFFER, 0);
#endif // defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)

2
engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
View file

@ -155,6 +155,6 @@ private:
} // wintermute namespace
#endif // defined(USE_OPENGL) && !defined(USE_GLES2)
#endif // defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#endif

2
engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
View file

@ -28,7 +28,7 @@
#include "graphics/opengl/system_headers.h"
#include "math/glmath.h"
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_SHADERS)
#include "engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h"
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"

2
engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
View file

@ -33,7 +33,7 @@
#include "math/matrix4.h"
#include "math/ray.h"
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_SHADERS)
#include "graphics/opengl/shader.h"

2
engines/wintermute/base/gfx/opengl/base_render_opengl_texture.cpp
View file

@ -36,7 +36,7 @@
#include "common/config-manager.h"
#include "graphics/transparent_surface.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#include "graphics/opengl/texture.h"
#include "graphics/opengl/surfacerenderer.h"

2
engines/wintermute/base/gfx/opengl/base_render_opengl_texture.h
View file

@ -35,7 +35,7 @@
#include "common/list.h"
#include "graphics/transform_struct.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
namespace Wintermute {
class BaseSurfaceOpenGLTexture;

4
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
View file

@ -24,7 +24,7 @@
#include "engines/wintermute/base/gfx/base_image.h"
#include "graphics/transparent_surface.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
@ -307,4 +307,4 @@ void BaseSurfaceOpenGL3D::setTexture() {
} // End of namespace Wintermute
#endif // defined(USE_OPENGL) && !defined(USE_GLES2)
#endif // defined(USE_OPENGL_GAME) && !defined(USE_GLES2)

2
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
View file

@ -26,7 +26,7 @@
#include "engines/wintermute/base/gfx/base_surface.h"
#include "graphics/opengl/texture.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
namespace Wintermute {

4
engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.cpp
View file

@ -38,7 +38,7 @@
#include "common/stream.h"
#include "common/system.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h"
#include "engines/wintermute/base/gfx/opengl/base_render_opengl_texture.h"
@ -487,4 +487,4 @@ bool BaseSurfaceOpenGLTexture::putSurface(const Graphics::Surface &surface, bool
} // End of namespace Wintermute
#endif // defined(USE_OPENGL) && !defined(USE_GLES2)
#endif // defined(USE_OPENGL_GAME) && !defined(USE_GLES2)

4
engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h
View file

@ -34,7 +34,7 @@
#include "engines/wintermute/base/gfx/base_surface.h"
#include "common/list.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
namespace Wintermute {
struct TransparentSurface;
@ -113,6 +113,6 @@ private:
} // End of namespace Wintermute
#endif // defined(USE_OPENGL) && !defined(USE_GLES2)
#endif // defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#endif

4
engines/wintermute/base/gfx/opengl/mesh3ds_opengl.cpp
View file

@ -23,7 +23,7 @@
#include "engines/wintermute/wintypes.h"
#include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h"
@ -51,4 +51,4 @@ void Mesh3DSOpenGL::render() {
} // namespace Wintermute
#endif // defined(USE_OPENGL) && !defined(USE_GLES2)
#endif // defined(USE_OPENGL_GAME) && !defined(USE_GLES2)

4
engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h
View file

@ -25,7 +25,7 @@
#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
namespace Wintermute {
@ -39,6 +39,6 @@ public:
} // namespace Wintermute
#endif // defined(USE_OPENGL) && !defined(USE_GLES2)
#endif // defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#endif

2
engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.cpp
View file

@ -23,7 +23,7 @@
#include "engines/wintermute/wintypes.h"
#include "graphics/opengl/system_headers.h"
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_SHADERS)
#include "engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h"

2
engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h
View file

@ -25,7 +25,7 @@
#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_SHADERS)
#include "graphics/opengl/shader.h"

4
engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
View file

@ -29,7 +29,7 @@
#include "engines/wintermute/base/gfx/x/material.h"
#include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/meshx_opengl.h"
@ -82,4 +82,4 @@ bool MeshXOpenGL::render(ModelX *model) {
} // namespace Wintermute
#endif // defined(USE_OPENGL) && !defined(USE_GLES2)
#endif // defined(USE_OPENGL_GAME) && !defined(USE_GLES2)

2
engines/wintermute/base/gfx/opengl/meshx_opengl.h
View file

@ -31,7 +31,7 @@
#include "engines/wintermute/base/gfx/x/meshx.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
namespace Wintermute {

2
engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
View file

@ -29,7 +29,7 @@
#include "engines/wintermute/base/gfx/x/material.h"
#include "graphics/opengl/system_headers.h"
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_SHADERS)
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h"

2
engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
View file

@ -31,7 +31,7 @@
#include "engines/wintermute/base/gfx/x/meshx.h"
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_SHADERS)
#include "graphics/opengl/shader.h"

4
engines/wintermute/base/gfx/opengl/render_ticket.cpp
View file

@ -31,7 +31,7 @@
#include "graphics/transform_tools.h"
#include "common/textconsole.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/render_ticket.h"
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h"
@ -208,4 +208,4 @@ void RenderTicketOpenGL::drawToSurface(Graphics::Surface *_targetSurface, Common
} // End of namespace Wintermute
#endif // defined(USE_OPENGL) && !defined(USE_GLES2)
#endif // defined(USE_OPENGL_GAME) && !defined(USE_GLES2)

4
engines/wintermute/base/gfx/opengl/render_ticket.h
View file

@ -33,7 +33,7 @@
#include "graphics/surface.h"
#include "common/rect.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
namespace Wintermute {
@ -79,6 +79,6 @@ private:
} // End of namespace Wintermute
#endif // defined(USE_OPENGL) && !defined(USE_GLES2)
#endif // defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#endif

2
engines/wintermute/base/gfx/opengl/shadow_volume_opengl.cpp
View file

@ -30,7 +30,7 @@
#include "engines/wintermute/dcgf.h"
#include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h"

4
engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h
View file

@ -31,7 +31,7 @@
#include "engines/wintermute/base/gfx/shadow_volume.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
namespace Wintermute {
@ -51,6 +51,6 @@ private:
} // namespace Wintermute
#endif // defined(USE_OPENGL) && !defined(USE_GLES2)
#endif // defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
#endif

2
engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
View file

@ -30,7 +30,7 @@
#include "engines/wintermute/dcgf.h"
#include "graphics/opengl/system_headers.h"
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_SHADERS)
#include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h"

2
engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
View file

@ -32,7 +32,7 @@
#include "engines/wintermute/base/gfx/shadow_volume.h"
#include "graphics/opengl/system_headers.h"
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_SHADERS)
#include "graphics/opengl/shader.h"

2
graphics/opengl/context.cpp
View file

@ -29,7 +29,7 @@
#include "graphics/opengl/system_headers.h"
#ifdef USE_OPENGL
#ifdef USE_OPENGL_GAME
namespace Common {
DECLARE_SINGLETON(OpenGL::ContextGL);

2
graphics/opengl/framebuffer.cpp
View file

@ -23,7 +23,7 @@
#include "common/textconsole.h"
#include "common/util.h"
#if defined(USE_OPENGL) && !defined(AMIGAOS)
#if defined(USE_OPENGL_GAME) && !defined(AMIGAOS)
#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)
#if defined(USE_OPENGL_GAME)
#include "graphics/opengl/surfacerenderer.h"

4
graphics/opengl/system_headers.h
View file

@ -48,9 +48,9 @@
#elif defined(USE_GLEW)
#include <GL/glew.h>
#elif defined(SDL_BACKEND) && defined(USE_OPENGL)
#elif defined(SDL_BACKEND) && defined(USE_OPENGL_GAME)
#include <SDL_opengl.h>
#elif defined(USE_OPENGL)
#elif defined(USE_OPENGL_GAME)
#include <GL/gl.h>
#endif

2
graphics/opengl/texture.cpp
View file

@ -22,7 +22,7 @@
#include "common/textconsole.h"
#if defined(USE_OPENGL)
#if defined(USE_OPENGL_GAME)
#include "graphics/opengl/texture.h"
#include "graphics/opengl/context.h"

2
graphics/opengl/tiledsurface.cpp
View file

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

6
graphics/renderer.cpp
View file

@ -27,7 +27,7 @@
namespace Graphics {
static const RendererTypeDescription rendererTypes[] = {
#if defined(USE_OPENGL) && !defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
{ "opengl", _s("OpenGL"), kRendererTypeOpenGL },
#endif
#if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
@ -76,13 +76,13 @@ RendererType getBestMatchingAvailableRendererType(RendererType desired) {
}
#endif
#if (!defined(USE_OPENGL) && defined(USE_OPENGL_SHADERS)) || defined(USE_GLES2)
#if (!defined(USE_OPENGL_GAME) && defined(USE_OPENGL_SHADERS)) || defined(USE_GLES2)
if (desired == kRendererTypeOpenGL) {
desired = kRendererTypeOpenGLShaders;
}
#endif
#if !defined(USE_OPENGL) && !defined(USE_GLES2) && !defined(USE_OPENGL_SHADERS)
#if !defined(USE_OPENGL_GAME) && !defined(USE_GLES2) && !defined(USE_OPENGL_SHADERS)
if (desired == kRendererTypeOpenGL || desired == kRendererTypeOpenGLShaders) {
desired = kRendererTypeTinyGL;
}