[Scummvm-cvs-logs] scummvm master -> fbf193f7562924e450961d92156fa915e8d69a68

[djwillis]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4cd34733a3 OPENGL: GL_BGRA does not exist in every GLES implementation.
fbf193f756 CONFIGURE: Add case for selecting OpenGL ES support on the OpenPandora.


Commit: 4cd34733a39fd64964c6d50a108d2c9e12634385
    https://github.com/scummvm/scummvm/commit/4cd34733a39fd64964c6d50a108d2c9e12634385
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2012-08-08T05:37:32-07:00

Commit Message:
OPENGL: GL_BGRA does not exist in every GLES implementation.

* It definately does not exist in the GLES implementations I can test with.
* Don't configure if USE_GLES is set.

Changed paths:
    backends/graphics/opengl/opengl-graphics.cpp



diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index dce902d..c99652d 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -918,11 +918,6 @@ void OpenGLGraphicsManager::getGLPixelFormat(Graphics::PixelFormat pixelFormat,
 		intFormat = GL_RGBA;
 		glFormat = GL_RGBA;
 		gltype = GL_UNSIGNED_SHORT_5_5_5_1;
-	} else if (pixelFormat == Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0)) { // RGB555
-		bpp = 2;
-		intFormat = GL_RGB;
-		glFormat = GL_BGRA;
-		gltype = GL_UNSIGNED_SHORT_1_5_5_5_REV;
 	} else if (pixelFormat == Graphics::PixelFormat(2, 4, 4, 4, 4, 12, 8, 4, 0)) { // RGBA4444
 		bpp = 2;
 		intFormat = GL_RGBA;
@@ -936,6 +931,13 @@ void OpenGLGraphicsManager::getGLPixelFormat(Graphics::PixelFormat pixelFormat,
 		glFormat = GL_RGB;
 		gltype = GL_UNSIGNED_BYTE;
 #ifndef USE_GLES
+	} else if (pixelFormat == Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0)) { // RGB555
+		// GL_BGRA does not exist in every GLES implementation so should not be configured if
+		// USE_GLES is set.
+		bpp = 2;
+		intFormat = GL_RGB;
+		glFormat = GL_BGRA;
+		gltype = GL_UNSIGNED_SHORT_1_5_5_5_REV;
 	} else if (pixelFormat == Graphics::PixelFormat(4, 8, 8, 8, 8, 16, 8, 0, 24)) { // ARGB8888
 		bpp = 4;
 		intFormat = GL_RGBA;


Commit: fbf193f7562924e450961d92156fa915e8d69a68
    https://github.com/scummvm/scummvm/commit/fbf193f7562924e450961d92156fa915e8d69a68
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2012-08-08T05:49:48-07:00

Commit Message:
CONFIGURE: Add case for selecting OpenGL ES support on the OpenPandora.

Changed paths:
    configure



diff --git a/configure b/configure
index ffcd0c1..06492ff 100755
--- a/configure
+++ b/configure
@@ -3501,6 +3501,21 @@ define_in_config_if_yes "$_freetype2" "USE_FREETYPE2"
 # Check for OpenGL (ES)
 #
 echocheck "OpenGL"
+
+case $_backend in
+	openpandora)
+		# Only enable OpenGL ES on the OpanPandora if --enable-opengl is passed in explicitly.
+		if test "$_opengl" = yes ; then
+			_opengl=yes
+			_opengles=yes
+			OPENGL_LIBS="-lGLES_CM -lEGL -lX11"
+			OPENGL_CFLAGS="$OPENGL_LIBS"
+			LIBS="$LIBS $OPENGL_LIBS"
+			INCLUDES="$INCLUDES $OPENGL_CFLAGS"
+		fi
+		;;
+esac
+
 if test "$_opengl" = auto ; then
 	_opengl=no
 	if test "$_backend" = "sdl" ; then