pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug 1162 (Error calling SDL_RenderReadPixels() with format=0)

Browse source
This commit is contained in:
Sam Lantinga 2011-03-10 01:03:43 -08:00
parent 903efd986f
commit 2f6aa755d6
1 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/render/opengl/SDL_render_gl.c
View file

@ -921,44 +921,56 @@ GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
{ {
GL_RenderData *data = (GL_RenderData *) renderer->driverdata; GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
SDL_Window *window = renderer->window; SDL_Window *window = renderer->window;
Uint32 temp_format = SDL_PIXELFORMAT_ARGB8888;
void *temp_pixels;
int temp_pitch;
GLint internalFormat; GLint internalFormat;
GLenum format, type; GLenum format, type;
Uint8 *src, *dst, *tmp; Uint8 *src, *dst, *tmp;
int w, h, length, rows; int w, h, length, rows;
int status;
GL_ActivateRenderer(renderer); GL_ActivateRenderer(renderer);
if (!convert_format(data, pixel_format, &internalFormat, &format, &type)) { temp_pitch = rect->w * SDL_BYTESPERPIXEL(temp_format);
/* FIXME: Do a temp copy to a format that is supported */ temp_pixels = SDL_malloc(rect->h * temp_pitch);
SDL_SetError("Unsupported pixel format"); if (!temp_pixels) {
SDL_OutOfMemory();
return -1; return -1;
} }
convert_format(data, temp_format, &internalFormat, &format, &type);
SDL_GetWindowSize(window, &w, &h); SDL_GetWindowSize(window, &w, &h);
data->glPixelStorei(GL_PACK_ALIGNMENT, 1); data->glPixelStorei(GL_PACK_ALIGNMENT, 1);
data->glPixelStorei(GL_PACK_ROW_LENGTH, data->glPixelStorei(GL_PACK_ROW_LENGTH,
(pitch / SDL_BYTESPERPIXEL(pixel_format))); (temp_pitch / SDL_BYTESPERPIXEL(temp_format)));
data->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h, data->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h,
format, type, pixels); format, type, temp_pixels);
/* Flip the rows to be top-down */ /* Flip the rows to be top-down */
length = rect->w * SDL_BYTESPERPIXEL(pixel_format); length = rect->w * SDL_BYTESPERPIXEL(temp_format);
src = (Uint8*)pixels + (rect->h-1)*pitch; src = (Uint8*)temp_pixels + (rect->h-1)*temp_pitch;
dst = (Uint8*)pixels; dst = (Uint8*)temp_pixels;
tmp = SDL_stack_alloc(Uint8, length); tmp = SDL_stack_alloc(Uint8, length);
rows = rect->h / 2; rows = rect->h / 2;
while (rows--) { while (rows--) {
SDL_memcpy(tmp, dst, length); SDL_memcpy(tmp, dst, length);
SDL_memcpy(dst, src, length); SDL_memcpy(dst, src, length);
SDL_memcpy(src, tmp, length); SDL_memcpy(src, tmp, length);
dst += pitch; dst += temp_pitch;
src -= pitch; src -= temp_pitch;
} }
SDL_stack_free(tmp); SDL_stack_free(tmp);
return 0; status = SDL_ConvertPixels(rect->w, rect->h,
temp_format, temp_pixels, temp_pitch,
pixel_format, pixels, pitch);
SDL_free(temp_pixels);
return status;
} }
static void static void