Mercurial > sdl-ios-xcode

changeset 4963:604077962776

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed screen texture format on Android I think this also fixes some of the red/blue channel swap bugs reported on iPhone.
author Sam Lantinga <slouken@libsdl.org>
date Wed, 05 Jan 2011 00:09:19 -0800
parents 730b234ba9ec
children 6c645018741e
files src/video/SDL_renderer_gles.c src/video/android/SDL_androidvideo.c
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/video/SDL_renderer_gles.c	Tue Jan 04 21:05:42 2011 -0800
+++ b/src/video/SDL_renderer_gles.c	Wed Jan 05 00:09:19 2011 -0800
@@ -118,7 +118,8 @@
       SDL_PIXELFORMAT_ABGR4444,
       SDL_PIXELFORMAT_ABGR1555,
       SDL_PIXELFORMAT_BGR565,
-      SDL_PIXELFORMAT_BGR24,
+      SDL_PIXELFORMAT_RGB24,
+      SDL_PIXELFORMAT_BGR888,
       SDL_PIXELFORMAT_ABGR8888},
      0,
      0}
@@ -380,11 +381,12 @@
     GLenum result;
 
     switch (texture->format) {
-    case SDL_PIXELFORMAT_BGR24:
+    case SDL_PIXELFORMAT_RGB24:
         internalFormat = GL_RGB;
         format = GL_RGB;
         type = GL_UNSIGNED_BYTE;
         break;
+    case SDL_PIXELFORMAT_BGR888:
     case SDL_PIXELFORMAT_ABGR8888:
         internalFormat = GL_RGBA;
         format = GL_RGBA;
--- a/src/video/android/SDL_androidvideo.c	Tue Jan 04 21:05:42 2011 -0800
+++ b/src/video/android/SDL_androidvideo.c	Wed Jan 05 00:09:19 2011 -0800
@@ -124,7 +124,7 @@
     SDL_DisplayMode mode;
 
     /* Use a fake 32-bpp desktop mode */
-    mode.format = SDL_PIXELFORMAT_RGB888;
+    mode.format = SDL_PIXELFORMAT_BGR888;
     mode.w = iScreenWidth;
     mode.h = iScreenHeight;
     mode.refresh_rate = 0;