Mercurial > sdl-ios-xcode

changeset 4896:d72e28642940

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Code will never reach SDL_SetTexturePalette since SDL_SetDisplayPalette will fail if the display e.g. is RGB32 or RGB24. The patch will ignore errors in SDL_SetDislayPalette. This should also affect the opengl renderer on systems supporting paletted textures - mine does not (NVIDIA). With this patch the directfb drivers delivers the same results for test_palette like the software renderer. Kind regards, André
author Sam Lantinga <slouken@libsdl.org>
date Mon, 27 Sep 2010 00:48:56 -0700
parents fd27410a5db0
children c3eb55210a90
files src/SDL_compat.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/SDL_compat.c	Sat Sep 25 17:06:41 2010 -0700
+++ b/src/SDL_compat.c	Mon Sep 27 00:48:56 2010 -0700
@@ -321,7 +321,10 @@
     }
     if (userdata == SDL_VideoSurface) {
         if (SDL_SetDisplayPalette(palette->colors, 0, palette->ncolors) < 0) {
-            return -1;
+        	/* The display surface not necessarily needs to have a palette.
+        	 * Just do nothing here and try to set the texture palette.
+        	 */
+            //return -1;
         }
         if (SDL_SetTexturePalette
             (SDL_VideoTexture, palette->colors, 0, palette->ncolors) < 0) {