Commit b2aebcc9 authored by Sam Lantinga's avatar Sam Lantinga

Fixed BadMatch error in X11 renderer

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403330
parent 8e523bb7
...@@ -427,6 +427,15 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ...@@ -427,6 +427,15 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
&attributes); &attributes);
depth = X11_GetDepthFromPixelFormat(data->format); depth = X11_GetDepthFromPixelFormat(data->format);
/* The image/pixmap depth must be the same as the window or you
get a BadMatch error when trying to putimage or copyarea.
*/
if (depth != attributes.depth) {
X11_DestroyTexture(renderer, texture);
SDL_SetError("Texture format doesn't match window format");
return -1;
}
if (data->yuv || texture->access == SDL_TEXTUREACCESS_STREAMING) { if (data->yuv || texture->access == SDL_TEXTUREACCESS_STREAMING) {
#ifndef NO_SHARED_MEMORY #ifndef NO_SHARED_MEMORY
XShmSegmentInfo *shminfo = &data->shminfo; XShmSegmentInfo *shminfo = &data->shminfo;
...@@ -475,6 +484,7 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ...@@ -475,6 +484,7 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
{ {
data->pixels = SDL_malloc(texture->h * data->pitch); data->pixels = SDL_malloc(texture->h * data->pitch);
if (!data->pixels) { if (!data->pixels) {
X11_DestroyTexture(renderer, texture);
SDL_OutOfMemory(); SDL_OutOfMemory();
return -1; return -1;
} }
...@@ -485,6 +495,7 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ...@@ -485,6 +495,7 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
SDL_BYTESPERPIXEL(data->format) * 8, SDL_BYTESPERPIXEL(data->format) * 8,
data->pitch); data->pitch);
if (!data->image) { if (!data->image) {
X11_DestroyTexture(renderer, texture);
SDL_SetError("XCreateImage() failed"); SDL_SetError("XCreateImage() failed");
return -1; return -1;
} }
...@@ -494,6 +505,7 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ...@@ -494,6 +505,7 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
XCreatePixmap(renderdata->display, renderdata->window, texture->w, XCreatePixmap(renderdata->display, renderdata->window, texture->w,
texture->h, depth); texture->h, depth);
if (data->pixmap == None) { if (data->pixmap == None) {
X11_DestroyTexture(renderer, texture);
SDL_SetError("XCteatePixmap() failed"); SDL_SetError("XCteatePixmap() failed");
return -1; return -1;
} }
...@@ -503,6 +515,7 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ...@@ -503,6 +515,7 @@ X11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
ZPixmap, 0, NULL, texture->w, texture->h, ZPixmap, 0, NULL, texture->w, texture->h,
SDL_BYTESPERPIXEL(data->format) * 8, data->pitch); SDL_BYTESPERPIXEL(data->format) * 8, data->pitch);
if (!data->image) { if (!data->image) {
X11_DestroyTexture(renderer, texture);
SDL_SetError("XCreateImage() failed"); SDL_SetError("XCreateImage() failed");
return -1; return -1;
} }
......
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