mirror of
https://github.com/scummvm/scummvm.git
synced 2026-06-20 05:45:29 +00:00
OPENGLES: Fix the projection matrix and the includes.
svn-id: r54756
This commit is contained in:
@@ -39,10 +39,10 @@
|
||||
#undef ARRAYSIZE
|
||||
#endif
|
||||
|
||||
#ifdef MACOSX
|
||||
#include <OpenGL/gl.h>
|
||||
#elif defined(USE_GLES)
|
||||
#if defined(USE_GLES)
|
||||
#include <GLES/gl.h>
|
||||
#elif defined(MACOSX)
|
||||
#include <OpenGL/gl.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#endif
|
||||
|
||||
@@ -32,10 +32,10 @@
|
||||
#undef ARRAYSIZE
|
||||
#endif
|
||||
|
||||
#if defined(SDL_BACKEND)
|
||||
#include <SDL_opengl.h>
|
||||
#elif defined(USE_GLES)
|
||||
#if defined(USE_GLES)
|
||||
#include <GLES/gl.h>
|
||||
#elif defined(SDL_BACKEND)
|
||||
#include <SDL_opengl.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
#endif
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
#if defined(ARRAYSIZE) && !defined(_WINDOWS_)
|
||||
#undef ARRAYSIZE
|
||||
#endif
|
||||
#include <SDL_opengl.h>
|
||||
|
||||
#include "backends/graphics/opengl/opengl-graphics.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user