Fixed so many things. See the changelog listed below.

1. Use SDL_X11_HAVE_XRENDER to check for RENDER at runtime. 2. Added lots of comments. 3. Added checks and lots of calls to SDL_SetError(). 4. Fixed X11_CreateTexture() so that the pixmap and image created are for the format specified by the user and not the window format. This is only for the RENDER case. 5. The above change required that functions to convert SDL pixel format enums to Visuals and XRenderPictFormats be added. 6. Fixed lots of 'style' issues.
libsdl-org · Jul 17, 2010 · d5430ff · d5430ff
1 parent d20f4fc
commit d5430ff
Show file tree

Hide file tree

Showing 2 changed files with 226 additions and 74 deletions.
diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c
@@ -23,7 +23,7 @@
 
 #include "SDL_x11video.h"
 
-#define X11MODES_DEBUG
+//#define X11MODES_DEBUG
 #undef SDL_VIDEO_DRIVER_X11_XINERAMA
 #undef SDL_VIDEO_DRIVER_X11_XRANDR
 #undef SDL_VIDEO_DRIVER_X11_VIDMODE
@@ -49,22 +49,6 @@ get_visualinfo(Display * display, int screen, XVisualInfo * vinfo)
             return 0;
         }
     }
-/*#ifdef SDL_VIDEO_DRIVER_X11_XRENDER
-    depth = 32;
-    long vinfo_mask;
-    XVisualInfo vinfo_templ;
-    vinfo_mask = (VisualDepthMask | VisualRedMaskMask | VisualGreenMaskMask | VisualBlueMaskMask);
-    vinfo_templ.depth = 32;
-    vinfo_templ.red_mask = 0xFF0000;
-    vinfo_templ.green_mask = 0xFF00;
-    vinfo_templ.blue_mask = 0xFF;
-    vi = XGetVisualInfo(display, vinfo_mask, &vinfo_templ, &nvis);
-    if(vi) {
-        *vinfo = *vi;
-        XFree(vi);
-        return 0;
-    }
-#endif*/
     depth = DefaultDepth(display, screen);
     if ((X11_UseDirectColorVisuals() &&
          XMatchVisualInfo(display, screen, depth, DirectColor, vinfo)) ||