diff --git a/backends/graphics/opengl/glerrorcheck.cpp b/backends/graphics/opengl/glerrorcheck.cpp index 3abcc27eedd..9989a4cf9d8 100644 --- a/backends/graphics/opengl/glerrorcheck.cpp +++ b/backends/graphics/opengl/glerrorcheck.cpp @@ -39,10 +39,10 @@ #undef ARRAYSIZE #endif -#ifdef MACOSX -#include -#elif defined(USE_GLES) +#if defined(USE_GLES) #include +#elif defined(MACOSX) +#include #else #include #endif diff --git a/backends/graphics/opengl/gltexture.h b/backends/graphics/opengl/gltexture.h index 92bd0ec8d9e..e7951a0c969 100644 --- a/backends/graphics/opengl/gltexture.h +++ b/backends/graphics/opengl/gltexture.h @@ -32,10 +32,10 @@ #undef ARRAYSIZE #endif -#if defined(SDL_BACKEND) -#include -#elif defined(USE_GLES) +#if defined(USE_GLES) #include +#elif defined(SDL_BACKEND) +#include #else #include #endif diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp index 35dd9a60463..e2f8dd4d304 100644 --- a/backends/graphics/opengl/opengl-graphics.cpp +++ b/backends/graphics/opengl/opengl-graphics.cpp @@ -1043,7 +1043,7 @@ void OpenGLGraphicsManager::initGL() { glMatrixMode(GL_PROJECTION); CHECK_GL_ERROR(); glLoadIdentity(); CHECK_GL_ERROR(); #ifdef USE_GLES - glOrthox(0, _videoMode.hardwareWidth, _videoMode.hardwareHeight, 0, -1, 1); CHECK_GL_ERROR(); + glOrthof(0, _videoMode.hardwareWidth, _videoMode.hardwareHeight, 0, -1, 1); CHECK_GL_ERROR(); #else glOrtho(0, _videoMode.hardwareWidth, _videoMode.hardwareHeight, 0, -1, 1); CHECK_GL_ERROR(); #endif diff --git a/backends/graphics/openglsdl/openglsdl-graphics.h b/backends/graphics/openglsdl/openglsdl-graphics.h index 548988e43ae..d39c0814de6 100644 --- a/backends/graphics/openglsdl/openglsdl-graphics.h +++ b/backends/graphics/openglsdl/openglsdl-graphics.h @@ -30,7 +30,6 @@ #if defined(ARRAYSIZE) && !defined(_WINDOWS_) #undef ARRAYSIZE #endif -#include #include "backends/graphics/opengl/opengl-graphics.h"