Skip to content

L
libSDL
Commit bce186d5 authored by Sunny Sachanandani's avatar Sunny Sachanandani
Browse files
Options

Implement blending modes for textures. Fix off-screen pixmaps to be ARGB... 

Implement blending modes for textures. Fix off-screen pixmaps to be ARGB rather than RGB to enable blending across frames. Clear the screen and off-screen pixmaps when the renderer is created.
parent 40daa46a
Show whitespace changes
Inline Side-by-side
Showing with 138 additions and 81 deletions
src/video/x11/SDL_x11modes.c
View file @ bce186d5
...@@ -49,7 +49,7 @@ get_visualinfo(Display * display, int screen, XVisualInfo * vinfo) ...@@ -49,7 +49,7 @@ get_visualinfo(Display * display, int screen, XVisualInfo * vinfo)
return 0; return 0;
} }
} }
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER /*#ifdef SDL_VIDEO_DRIVER_X11_XRENDER
depth = 32; depth = 32;
long vinfo_mask; long vinfo_mask;
XVisualInfo vinfo_templ; XVisualInfo vinfo_templ;
...@@ -64,7 +64,7 @@ get_visualinfo(Display * display, int screen, XVisualInfo * vinfo) ...@@ -64,7 +64,7 @@ get_visualinfo(Display * display, int screen, XVisualInfo * vinfo)
XFree(vi); XFree(vi);
return 0; return 0;
} }
#endif #endif*/
depth = DefaultDepth(display, screen); depth = DefaultDepth(display, screen);
if ((X11_UseDirectColorVisuals() && if ((X11_UseDirectColorVisuals() &&
XMatchVisualInfo(display, screen, depth, DirectColor, vinfo)) || XMatchVisualInfo(display, screen, depth, DirectColor, vinfo)) ||
......
src/video/x11/SDL_x11render.c
View file @ bce186d5
...@@ -123,7 +123,8 @@ typedef struct ...@@ -123,7 +123,8 @@ typedef struct
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
Picture picture; Picture picture;
XRenderPictFormat* picture_fmt; XRenderPictFormat* picture_fmt;
SDL_bool use_xrender; int blend_op;
// SDL_bool use_xrender;
#endif #endif
XImage *image; XImage *image;
#ifndef NO_SHARED_MEMORY #ifndef NO_SHARED_MEMORY
...@@ -243,39 +244,46 @@ X11_CreateRenderer(SDL_Window * window, Uint32 flags) ...@@ -243,39 +244,46 @@ X11_CreateRenderer(SDL_Window * window, Uint32 flags)
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
int event_basep, error_basep; int event_basep, error_basep;
if(XRenderQueryExtension(data->display, &event_basep, &error_basep) == True) { if(XRenderQueryExtension(data->display,
&event_basep,
&error_basep) == True) {
data->use_xrender = SDL_TRUE; data->use_xrender = SDL_TRUE;
data->xwindow_pict_fmt = XRenderFindStandardFormat(data->display, PictStandardARGB32); data->xwindow_pict_fmt = XRenderFindVisualFormat(data->display,
if(!data->xwindow_pict_fmt) { data->visual);
data->use_xrender = SDL_FALSE; data->xwindow_pict = XRenderCreatePicture(data->display,
goto fallback; data->xwindow,
} data->xwindow_pict_fmt,
data->xwindow_pict = XRenderCreatePicture(data->display, data->xwindow, data->xwindow_pict_fmt,
0, NULL); 0, NULL);
if(!data->xwindow_pict) { XRenderComposite(data->display,
data->use_xrender = SDL_FALSE; PictOpClear,
goto fallback; data->xwindow_pict,
} None,
data->xwindow_pict,
0, 0,
0, 0,
0, 0,
window->w, window->h);
renderer->info.blend_modes |= renderer->info.blend_modes |=
(SDL_BLENDMODE_BLEND | SDL_BLENDMODE_ADD | SDL_BLENDMODE_MASK); (SDL_BLENDMODE_BLEND | SDL_BLENDMODE_ADD | SDL_BLENDMODE_MASK);
// Create a 1 bit depth mask // Create a 1 bit depth mask
data->mask = XCreatePixmap(data->display, data->xwindow, data->mask = XCreatePixmap(data->display, data->xwindow,
window->w, window->h, 1); window->w, window->h, 1);
data->mask_pict = XRenderCreatePicture(data->display, data->mask, data->mask_pict =
XRenderCreatePicture(data->display, data->mask,
XRenderFindStandardFormat(data->display, XRenderFindStandardFormat(data->display,
PictStandardA1), PictStandardA1),
0, NULL); 0, NULL);
XGCValues gcv_mask; XGCValues gcv_mask;
gcv_mask.foreground = 1; gcv_mask.foreground = 1;
gcv_mask.background = 0; gcv_mask.background = 0;
data->mask_gc = XCreateGC(data->display, data->mask, GCBackground | GCForeground, &gcv_mask); data->mask_gc = XCreateGC(data->display, data->mask,
GCBackground | GCForeground, &gcv_mask);
renderer->blendMode = SDL_BLENDMODE_BLEND; renderer->blendMode = SDL_BLENDMODE_BLEND;
data->blend_op = PictOpOver; data->blend_op = PictOpOver;
} }
else { else {
data->use_xrender = SDL_FALSE; data->use_xrender = SDL_FALSE;
} }
fallback:
#endif #endif
if (flags & SDL_RENDERER_SINGLEBUFFER) { if (flags & SDL_RENDERER_SINGLEBUFFER) {
...@@ -293,9 +301,21 @@ X11_CreateRenderer(SDL_Window * window, Uint32 flags) ...@@ -293,9 +301,21 @@ X11_CreateRenderer(SDL_Window * window, Uint32 flags)
n = 1; n = 1;
} }
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER
if (data->use_xrender) {
data->pixmaps[i] = XCreatePixmap(data->display,
data->xwindow,
window->w,
window->h,
32);
}
else
#endif
{
data->pixmaps[i] = data->pixmaps[i] =
XCreatePixmap(data->display, data->xwindow, window->w, window->h, XCreatePixmap(data->display, data->xwindow, window->w, window->h,
displaydata->depth); displaydata->depth);
}
if (data->pixmaps[i] == None) { if (data->pixmaps[i] == None) {
X11_DestroyRenderer(renderer); X11_DestroyRenderer(renderer);
SDL_SetError("XCreatePixmap() failed"); SDL_SetError("XCreatePixmap() failed");
...@@ -304,14 +324,21 @@ X11_CreateRenderer(SDL_Window * window, Uint32 flags) ...@@ -304,14 +324,21 @@ X11_CreateRenderer(SDL_Window * window, Uint32 flags)
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
if(data->use_xrender == SDL_TRUE) { if(data->use_xrender == SDL_TRUE) {
data->pixmap_picts[i] = data->pixmap_picts[i] =
XRenderCreatePicture(data->display, data->pixmaps[i], data->xwindow_pict_fmt, XRenderCreatePicture(data->display,
data->pixmaps[i],
XRenderFindStandardFormat(data->display,
PictStandardARGB32),
0, None); 0, None);
if(!data->pixmap_picts[i]) { XRenderComposite(data->display,
data->use_xrender = SDL_FALSE; PictOpClear,
} data->pixmap_picts[i],
XRenderComposite(data->display, PictOpClear, None,
data->pixmap_picts[i], None, data->pixmap_picts[i], data->pixmap_picts[i],
0, 0, 0, 0, 0, 0, window->w, window->h); 0, 0,
0, 0,
0, 0,
window->w, window->h);
} }
#endif #endif
} }
...@@ -381,9 +408,22 @@ X11_DisplayModeChanged(SDL_Renderer * renderer) ...@@ -381,9 +408,22 @@ X11_DisplayModeChanged(SDL_Renderer * renderer)
} }
} }
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER
if (data->use_xrender) {
data->pixmaps[i] =
XCreatePixmap(data->display,
data->xwindow,
window->w,
window->h,
32);
}
else
#endif
{
data->pixmaps[i] = data->pixmaps[i] =
XCreatePixmap(data->display, data->xwindow, window->w, window->h, XCreatePixmap(data->display, data->xwindow, window->w, window->h,
data->depth); data->depth);
}
if (data->pixmaps[i] == None) { if (data->pixmaps[i] == None) {
SDL_SetError("XCreatePixmap() failed"); SDL_SetError("XCreatePixmap() failed");
return -1; return -1;
...@@ -391,14 +431,21 @@ X11_DisplayModeChanged(SDL_Renderer * renderer) ...@@ -391,14 +431,21 @@ X11_DisplayModeChanged(SDL_Renderer * renderer)
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
if(data->use_xrender == SDL_TRUE) { if(data->use_xrender == SDL_TRUE) {
data->pixmap_picts[i] = data->pixmap_picts[i] =
XRenderCreatePicture(data->display, data->pixmaps[i], data->xwindow_pict_fmt, XRenderCreatePicture(data->display,
data->pixmaps[i],
XRenderFindStandardFormat(data->display,
PictStandardARGB32),
0, None); 0, None);
if(!data->pixmap_picts[i]) { XRenderComposite(data->display,
data->use_xrender = SDL_FALSE; PictOpClear,
} data->pixmap_picts[i],
XRenderComposite(data->display, PictOpClear, None,
data->pixmap_picts[i], None, data->pixmap_picts[i], data->pixmap_picts[i],
0, 0, 0, 0, 0, 0, window->w, window->h); 0, 0,
0, 0,
0, 0,
window->w, window->h);
} }
#endif #endif
} }
...@@ -442,8 +489,6 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ...@@ -442,8 +489,6 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
can be no BadMatch error since Xrender takes care of that. can be no BadMatch error since Xrender takes care of that.
*/ */
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
// Assume the texture is supported by Xrender
data->use_xrender = SDL_TRUE;
if (renderdata->use_xrender == SDL_FALSE) { if (renderdata->use_xrender == SDL_FALSE) {
if (texture->format != display->current_mode.format) { if (texture->format != display->current_mode.format) {
SDL_SetError("Texture format doesn't match window format"); SDL_SetError("Texture format doesn't match window format");
...@@ -578,32 +623,22 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ...@@ -578,32 +623,22 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
} }
} }
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
if(renderdata->use_xrender && data->pixmap) { if(renderdata->use_xrender) {
data->use_xrender = SDL_TRUE; data->picture_fmt = renderdata->xwindow_pict_fmt;
data->picture_fmt =
XRenderFindVisualFormat(renderdata->display, renderdata->visual);
if(!data->picture_fmt) {
printf("XRenderFindFormat failed!\n");
data->use_xrender = SDL_FALSE;
}
data->picture = data->picture =
XRenderCreatePicture(renderdata->display, data->pixmap, XRenderCreatePicture(renderdata->display, data->pixmap,
data->picture_fmt, 0, NULL); data->picture_fmt, 0, NULL);
if(!data->picture) {
data->use_xrender = SDL_FALSE;
}
} }
/* We thought we could render the texture with Xrender but this was /* We thought we could render the texture with Xrender but this was
not possible for some reason. Now we must ensure that texture not possible for some reason. Now we must ensure that texture
format and window format match to avoid a BadMatch error when format and window format match to avoid a BadMatch error when
rendering using the old pipeline. rendering using the old pipeline.
*/
if(data->use_xrender == SDL_FALSE) { if(data->use_xrender == SDL_FALSE) {
if (texture->format != display->current_mode.format) { if (texture->format != display->current_mode.format) {
SDL_SetError("Texture format doesn't match window format"); SDL_SetError("Texture format doesn't match window format");
return -1; return -1;
} }
} }*/
#endif #endif
return 0; return 0;
} }
...@@ -626,12 +661,26 @@ X11_QueryTexturePixels(SDL_Renderer * renderer, SDL_Texture * texture, ...@@ -626,12 +661,26 @@ X11_QueryTexturePixels(SDL_Renderer * renderer, SDL_Texture * texture,
static int static int
X11_SetTextureBlendMode(SDL_Renderer * renderer, SDL_Texture * texture) X11_SetTextureBlendMode(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
X11_TextureData *data = (X11_TextureData *) texture->driverdata;
switch (texture->blendMode) { switch (texture->blendMode) {
case SDL_BLENDMODE_NONE: case SDL_BLENDMODE_NONE:
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER
data->blend_op = PictOpSrc;
return 0;
case SDL_BLENDMODE_BLEND:
data->blend_op = PictOpOver;
return 0; return 0;
case SDL_BLENDMODE_ADD:
data->blend_op = PictOpAdd;
return 0;
#endif
default: default:
SDL_Unsupported(); SDL_Unsupported();
texture->blendMode = SDL_BLENDMODE_NONE; texture->blendMode = SDL_BLENDMODE_NONE;
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER
texture->blendMode = SDL_BLENDMODE_BLEND;
data->blend_op = PictOpOver;
#endif
return -1; return -1;
} }
} }
...@@ -795,7 +844,7 @@ xrenderdrawcolor(SDL_Renderer *renderer) ...@@ -795,7 +844,7 @@ xrenderdrawcolor(SDL_Renderer *renderer)
else else
alphad = (renderer->a) / 255.0; alphad = (renderer->a) / 255.0;
xrender_color.alpha = (unsigned short) (alphad * 0xFFFF); xrender_color.alpha = (unsigned short) ((renderer->a / 255.0) * 0xFFFF);
xrender_color.red = xrender_color.red =
(unsigned short) ((renderer->r / 255.0) * alphad * 0xFFFF); (unsigned short) ((renderer->r / 255.0) * alphad * 0xFFFF);
...@@ -1170,10 +1219,8 @@ X11_RenderFillRects(SDL_Renderer * renderer, const SDL_Rect ** rects, int count) ...@@ -1170,10 +1219,8 @@ X11_RenderFillRects(SDL_Renderer * renderer, const SDL_Rect ** rects, int count)
if(data->use_xrender == SDL_TRUE) { if(data->use_xrender == SDL_TRUE) {
XRenderColor foreground; XRenderColor foreground;
XRenderPictureAttributes attributes; XRenderPictureAttributes attributes;
unsigned long valuemask;
foreground = xrenderdrawcolor(renderer); foreground = xrenderdrawcolor(renderer);
valuemask = CPClipMask;
attributes.clip_mask = data->mask; attributes.clip_mask = data->mask;
XRenderComposite(data->display, PictOpClear, data->mask_pict, None, data->mask_pict, XRenderComposite(data->display, PictOpClear, data->mask_pict, None, data->mask_pict,
...@@ -1181,15 +1228,14 @@ X11_RenderFillRects(SDL_Renderer * renderer, const SDL_Rect ** rects, int count) ...@@ -1181,15 +1228,14 @@ X11_RenderFillRects(SDL_Renderer * renderer, const SDL_Rect ** rects, int count)
XFillRectangles(data->display, data->mask, data->mask_gc, XFillRectangles(data->display, data->mask, data->mask_gc,
xrects, xcount); xrects, xcount);
XRenderChangePicture(data->display, data->drawable_pict, valuemask, &attributes); XRenderChangePicture(data->display, data->drawable_pict, CPClipMask, &attributes);
Picture fill_pict = XRenderCreateSolidFill(data->display,
Picture fill = &foreground);
XRenderCreateSolidFill(data->display, &foreground); XRenderComposite(data->display, data->blend_op, fill_pict, None,
XRenderComposite(data->display, data->blend_op, fill, data->mask_pict,
data->drawable_pict, 0, 0, 0, 0, 0, 0, window->w, window->h); data->drawable_pict, 0, 0, 0, 0, 0, 0, window->w, window->h);
attributes.clip_mask = None; attributes.clip_mask = None;
XRenderChangePicture(data->display, data->drawable_pict, valuemask, &attributes); XRenderChangePicture(data->display, data->drawable_pict, CPClipMask, &attributes);
XRenderFreePicture(data->display, fill); XRenderFreePicture(data->display, fill_pict);
} }
else else
#endif #endif
...@@ -1219,7 +1265,7 @@ X11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, ...@@ -1219,7 +1265,7 @@ X11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
SDL_AddDirtyRect(&data->dirty, dstrect); SDL_AddDirtyRect(&data->dirty, dstrect);
} }
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
if (data->use_xrender && texturedata->use_xrender) { if (data->use_xrender) {
if(texture->access == SDL_TEXTUREACCESS_STREAMING) { if(texture->access == SDL_TEXTUREACCESS_STREAMING) {
#ifndef NO_SHARED_MEMORY #ifndef NO_SHARED_MEMORY
if(texturedata->shminfo.shmaddr) { if(texturedata->shminfo.shmaddr) {
...@@ -1236,9 +1282,16 @@ X11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, ...@@ -1236,9 +1282,16 @@ X11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
dstrect->y, srcrect->w, srcrect->h); dstrect->y, srcrect->w, srcrect->h);
} }
} }
Picture pict;
if(texture->blendMode == SDL_BLENDMODE_NONE)
pict = None;
else
pict = texturedata->picture;
if(srcrect->w == dstrect->w && srcrect->h == dstrect->h) { if(srcrect->w == dstrect->w && srcrect->h == dstrect->h) {
XRenderComposite(data->display, PictOpOver, texturedata->picture, None, data->drawable_pict, XRenderComposite(data->display, texturedata->blend_op, texturedata->picture,
srcrect->x, srcrect->y, 0, 0, dstrect->x, dstrect->y, srcrect->w, srcrect->h); pict, data->drawable_pict, srcrect->x, srcrect->y,
srcrect->x, srcrect->y, dstrect->x, dstrect->y,
srcrect->w, srcrect->h);
} else { } else {
Pixmap scaling_pixmap = Pixmap scaling_pixmap =
XCreatePixmap(data->display, texturedata->pixmap, dstrect->w, dstrect->h, XCreatePixmap(data->display, texturedata->pixmap, dstrect->w, dstrect->h,
...@@ -1248,7 +1301,7 @@ X11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, ...@@ -1248,7 +1301,7 @@ X11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
0, NULL); 0, NULL);
XRenderComposite(data->display, PictOpClear, scaling_picture, None, scaling_picture, XRenderComposite(data->display, PictOpClear, scaling_picture, None, scaling_picture,
0, 0, 0, 0, 0, 0, dstrect->w, dstrect->h); 0, 0, 0, 0, 0, 0, dstrect->w, dstrect->h);
XRenderComposite(data->display, PictOpSrc, texturedata->picture, None, scaling_picture, XRenderComposite(data->display, PictOpSrc, texturedata->picture, pict, scaling_picture,
srcrect->x, srcrect->y, 0, 0, 0, 0, srcrect->w, srcrect->h); srcrect->x, srcrect->y, 0, 0, 0, 0, srcrect->w, srcrect->h);
double xscale = ((double) dstrect->w) / srcrect->w; double xscale = ((double) dstrect->w) / srcrect->w;
double yscale = ((double) dstrect->h) / srcrect->h; double yscale = ((double) dstrect->h) / srcrect->h;
...@@ -1257,7 +1310,7 @@ X11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, ...@@ -1257,7 +1310,7 @@ X11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
{XDoubleToFixed(0), XDoubleToFixed(yscale), XDoubleToFixed(0)}, {XDoubleToFixed(0), XDoubleToFixed(yscale), XDoubleToFixed(0)},
{XDoubleToFixed(0), XDoubleToFixed(0), XDoubleToFixed(xscale * yscale)}}}; {XDoubleToFixed(0), XDoubleToFixed(0), XDoubleToFixed(xscale * yscale)}}};
XRenderSetPictureTransform(data->display, scaling_picture, &xform); XRenderSetPictureTransform(data->display, scaling_picture, &xform);
XRenderComposite(data->display, PictOpOver, scaling_picture, None, data->drawable_pict, XRenderComposite(data->display, texturedata->blend_op, scaling_picture, None, data->drawable_pict,
0, 0, 0, 0, dstrect->x, dstrect->y, dstrect->w, dstrect->h); 0, 0, 0, 0, dstrect->x, dstrect->y, dstrect->w, dstrect->h);
XRenderFreePicture(data->display, scaling_picture); XRenderFreePicture(data->display, scaling_picture);
XFreePixmap(data->display, scaling_pixmap); XFreePixmap(data->display, scaling_pixmap);
...@@ -1445,9 +1498,15 @@ X11_RenderPresent(SDL_Renderer * renderer) ...@@ -1445,9 +1498,15 @@ X11_RenderPresent(SDL_Renderer * renderer)
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
if(data->use_xrender == SDL_TRUE) if(data->use_xrender == SDL_TRUE)
{ {
XRenderComposite(data->display, PictOpOver, data->drawable_pict, None, XRenderComposite(data->display,
data->xwindow_pict, rect->x, rect->y, 0, 0, rect->x, rect->y, data->blend_op,
rect->w+1, rect->h+1); data->drawable_pict,
None,
data->xwindow_pict,
rect->x, rect->y,
0, 0,
rect->x, rect->y,
rect->w, rect->h);
} }
else else
#endif #endif
...@@ -1536,12 +1595,9 @@ X11_DestroyRenderer(SDL_Renderer * renderer) ...@@ -1536,12 +1595,9 @@ X11_DestroyRenderer(SDL_Renderer * renderer)
if (data->gc) { if (data->gc) {
XFreeGC(data->display, data->gc); XFreeGC(data->display, data->gc);
} }
if (data->drawable) {
XFreePixmap(data->display, data->drawable);
}
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER #ifdef SDL_VIDEO_DRIVER_X11_XRENDER
if (data->mask_gc) { if (data->mask_gc) {
XFreeGC(data->display, data->gc); XFreeGC(data->display, data->mask_gc);
} }
if (data->mask_pict) { if (data->mask_pict) {
XRenderFreePicture(data->display, data->mask_pict); XRenderFreePicture(data->display, data->mask_pict);
......
src/video/x11/SDL_x11window.c
View file @ bce186d5
...@@ -513,9 +513,6 @@ X11_CreateWindow(_THIS, SDL_Window * window) ...@@ -513,9 +513,6 @@ X11_CreateWindow(_THIS, SDL_Window * window)
} else { } else {
y = window->y; y = window->y;
} }
#ifdef SDL_VIDEO_DRIVER_X11_XRENDER
xattr.background_pixel = 0xFF000000;
#endif
w = XCreateWindow(data->display, w = XCreateWindow(data->display,
RootWindow(data->display, displaydata->screen), x, y, RootWindow(data->display, displaydata->screen), x, y,
...@@ -526,6 +523,10 @@ X11_CreateWindow(_THIS, SDL_Window * window) ...@@ -526,6 +523,10 @@ X11_CreateWindow(_THIS, SDL_Window * window)
SDL_SetError("Couldn't create window"); SDL_SetError("Couldn't create window");
return -1; return -1;
} }
/*#ifdef SDL_VIDEO_DRIVER_X11_XRENDER
//XSetWindowBackground(data->display, w, 0xFF000000);
//XSetWindowBackgroundPixmap(data->display, w, ParentRelative);
#endif*/
#if SDL_VIDEO_DRIVER_PANDORA #if SDL_VIDEO_DRIVER_PANDORA
/* Create the GLES window surface */ /* Create the GLES window surface */
_this->gles_data->egl_surface = _this->gles_data->egl_surface =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment