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

OPENGLES: Fix the projection matrix and the includes.

Browse source 
svn-id: r54756
This commit is contained in:
Jordi Vilalta Prat 2010-12-03 19:43:27 +00:00
parent f1d961a35e
commit 5884f5a7ac
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backends/graphics/opengl/glerrorcheck.cpp
View file

@ -39,10 +39,10 @@
#undef ARRAYSIZE #undef ARRAYSIZE
#endif #endif
#ifdef MACOSX #if defined(USE_GLES)
#include <OpenGL/gl.h>
#elif defined(USE_GLES)
#include <GLES/gl.h> #include <GLES/gl.h>
#elif defined(MACOSX)
#include <OpenGL/gl.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#endif #endif

6
backends/graphics/opengl/gltexture.h
View file

@ -32,10 +32,10 @@
#undef ARRAYSIZE #undef ARRAYSIZE
#endif #endif
#if defined(SDL_BACKEND) #if defined(USE_GLES)
#include <SDL_opengl.h>
#elif defined(USE_GLES)
#include <GLES/gl.h> #include <GLES/gl.h>
#elif defined(SDL_BACKEND)
#include <SDL_opengl.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#endif #endif

2
backends/graphics/opengl/opengl-graphics.cpp
View file

@ -1043,7 +1043,7 @@ void OpenGLGraphicsManager::initGL() {
glMatrixMode(GL_PROJECTION); CHECK_GL_ERROR(); glMatrixMode(GL_PROJECTION); CHECK_GL_ERROR();
glLoadIdentity(); CHECK_GL_ERROR(); glLoadIdentity(); CHECK_GL_ERROR();
#ifdef USE_GLES #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 #else
glOrtho(0, _videoMode.hardwareWidth, _videoMode.hardwareHeight, 0, -1, 1); CHECK_GL_ERROR(); glOrtho(0, _videoMode.hardwareWidth, _videoMode.hardwareHeight, 0, -1, 1); CHECK_GL_ERROR();
#endif #endif

1
backends/graphics/openglsdl/openglsdl-graphics.h
View file

@ -30,7 +30,6 @@
#if defined(ARRAYSIZE) && !defined(_WINDOWS_) #if defined(ARRAYSIZE) && !defined(_WINDOWS_)
#undef ARRAYSIZE #undef ARRAYSIZE
#endif #endif
#include <SDL_opengl.h>
#include "backends/graphics/opengl/opengl-graphics.h" #include "backends/graphics/opengl/opengl-graphics.h"