[Scummvm-cvs-logs] SF.net SVN: scummvm:[54756] scummvm/trunk/backends/graphics/opengl
jvprat at users.sourceforge.net
jvprat at users.sourceforge.net
Fri Dec 3 20:43:28 CET 2010
Revision: 54756
http://scummvm.svn.sourceforge.net/scummvm/?rev=54756&view=rev
Author: jvprat
Date: 2010-12-03 19:43:27 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
OPENGLES: Fix the projection matrix and the includes.
Modified Paths:
--------------
scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp
scummvm/trunk/backends/graphics/opengl/gltexture.h
scummvm/trunk/backends/graphics/opengl/opengl-graphics.cpp
scummvm/trunk/backends/graphics/openglsdl/openglsdl-graphics.h
Modified: scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp
===================================================================
--- scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp 2010-12-03 19:16:23 UTC (rev 54755)
+++ scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp 2010-12-03 19:43:27 UTC (rev 54756)
@@ -39,10 +39,10 @@
#undef ARRAYSIZE
#endif
-#ifdef MACOSX
+#if defined(USE_GLES)
+#include <GLES/gl.h>
+#elif defined(MACOSX)
#include <OpenGL/gl.h>
-#elif defined(USE_GLES)
-#include <GLES/gl.h>
#else
#include <GL/gl.h>
#endif
Modified: scummvm/trunk/backends/graphics/opengl/gltexture.h
===================================================================
--- scummvm/trunk/backends/graphics/opengl/gltexture.h 2010-12-03 19:16:23 UTC (rev 54755)
+++ scummvm/trunk/backends/graphics/opengl/gltexture.h 2010-12-03 19:43:27 UTC (rev 54756)
@@ -32,10 +32,10 @@
#undef ARRAYSIZE
#endif
-#if defined(SDL_BACKEND)
+#if defined(USE_GLES)
+#include <GLES/gl.h>
+#elif defined(SDL_BACKEND)
#include <SDL_opengl.h>
-#elif defined(USE_GLES)
-#include <GLES/gl.h>
#else
#include <GL/gl.h>
#endif
Modified: scummvm/trunk/backends/graphics/opengl/opengl-graphics.cpp
===================================================================
--- scummvm/trunk/backends/graphics/opengl/opengl-graphics.cpp 2010-12-03 19:16:23 UTC (rev 54755)
+++ scummvm/trunk/backends/graphics/opengl/opengl-graphics.cpp 2010-12-03 19:43:27 UTC (rev 54756)
@@ -1043,7 +1043,7 @@
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
Modified: scummvm/trunk/backends/graphics/openglsdl/openglsdl-graphics.h
===================================================================
--- scummvm/trunk/backends/graphics/openglsdl/openglsdl-graphics.h 2010-12-03 19:16:23 UTC (rev 54755)
+++ scummvm/trunk/backends/graphics/openglsdl/openglsdl-graphics.h 2010-12-03 19:43:27 UTC (rev 54756)
@@ -30,7 +30,6 @@
#if defined(ARRAYSIZE) && !defined(_WINDOWS_)
#undef ARRAYSIZE
#endif
-#include <SDL_opengl.h>
#include "backends/graphics/opengl/opengl-graphics.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list