aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
Diffstat (limited to 'backends')
-rw-r--r--backends/graphics/opengl/glerrorcheck.cpp1
-rw-r--r--backends/graphics/opengl/gltexture.cpp6
-rw-r--r--backends/graphics/opengl/opengl-graphics.cpp2
-rw-r--r--backends/graphics/openglsdl/openglsdl-graphics.cpp2
4 files changed, 4 insertions, 7 deletions
diff --git a/backends/graphics/opengl/glerrorcheck.cpp b/backends/graphics/opengl/glerrorcheck.cpp
index ee177f0ac5..8d5dcf49da 100644
--- a/backends/graphics/opengl/glerrorcheck.cpp
+++ b/backends/graphics/opengl/glerrorcheck.cpp
@@ -55,6 +55,7 @@ static const char *getGlErrStr(GLenum error) {
case GL_OUT_OF_MEMORY: return "GL_OUT_OF_MEMORY";
}
+ // FIXME: Convert to use Common::String::format()
static char buf[40];
snprintf(buf, sizeof(buf), "(Unknown GL error code 0x%x)", error);
return buf;
diff --git a/backends/graphics/opengl/gltexture.cpp b/backends/graphics/opengl/gltexture.cpp
index e43cbe2266..650f12b92c 100644
--- a/backends/graphics/opengl/gltexture.cpp
+++ b/backends/graphics/opengl/gltexture.cpp
@@ -35,6 +35,7 @@
// Supported GL extensions
static bool npot_supported = false;
+static bool glext_inited = false;
/*static inline GLint xdiv(int numerator, int denominator) {
assert(numerator < (1 << 16));
@@ -54,10 +55,9 @@ static GLuint nextHigher2(GLuint v) {
}
void GLTexture::initGLExtensions() {
- static bool inited = false;
// Return if extensions were already checked
- if (inited)
+ if (glext_inited)
return;
// Get a string with all extensions
@@ -72,7 +72,7 @@ void GLTexture::initGLExtensions() {
npot_supported = true;
}
- inited = true;
+ glext_inited = true;
}
GLTexture::GLTexture(byte bpp, GLenum internalFormat, GLenum format, GLenum type)
diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index 2acdffa3b0..f826da48fe 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -405,11 +405,9 @@ void OpenGLGraphicsManager::setShakePos(int shakeOffset) {
}
void OpenGLGraphicsManager::setFocusRectangle(const Common::Rect& rect) {
-
}
void OpenGLGraphicsManager::clearFocusRectangle() {
-
}
//
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index 940dd8089a..01ea0d465d 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -65,10 +65,8 @@ OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager()
}
OpenGLSdlGraphicsManager::~OpenGLSdlGraphicsManager() {
-
}
-
bool OpenGLSdlGraphicsManager::hasFeature(OSystem::Feature f) {
return
(f == OSystem::kFeatureFullscreenMode) ||