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

GRAPHICS: Clean up OpenGL defines (#3551)

Browse source
This commit is contained in:
Cameron Cawley 2021-11-17 23:56:21 +00:00 • committed by GitHub
parent 1c8bb3cccc
commit 4d206e5286
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 127 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graphics/opengl/surfacerenderer.cpp
View file

@ -22,27 +22,27 @@
#include "common/scummsys.h"
#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)
#include "graphics/opengl/surfacerenderer.h"
#include "graphics/opengl/context.h"
#include "graphics/opengl/texture.h"
#if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#if defined(USE_OPENGL_SHADERS)
#include "graphics/opengl/shader.h"
#endif
namespace OpenGL {
SurfaceRenderer *createBestSurfaceRenderer() {
#if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#if defined(USE_OPENGL_SHADERS)
if (OpenGLContext.shadersSupported) {
return new ShaderSurfaceRenderer();
}
#endif
#ifndef USE_GLES2
#if defined(USE_OPENGL_GAME)
return new FixedSurfaceRenderer();
#else
error("Could not create an appropriate surface renderer for the current OpenGL context");
@ -71,7 +71,7 @@ void SurfaceRenderer::enableAlphaBlending(bool enable) {
_alphaBlending = enable;
}
#ifndef USE_GLES2
#if defined(USE_OPENGL_GAME)
FixedSurfaceRenderer::~FixedSurfaceRenderer() {
}
@ -145,7 +145,7 @@ void FixedSurfaceRenderer::restorePreviousState() {
#endif
#if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#if defined(USE_OPENGL_SHADERS)
ShaderSurfaceRenderer::ShaderSurfaceRenderer() {
const GLfloat vertices[] = {