joel16/SDL2
1
0
Fork 0
mirror of https://github.com/joel16/SDL2.git synced 2024-12-13 22:38:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed GL_RenderWritePixels() - thanks Ryan!

Browse Source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404357
This commit is contained in:
Sam Lantinga 2010-01-06 06:12:01 +00:00
parent f643e8c798
commit 9a2b0cfb61
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/video/SDL_renderer_gl.c
View File

@ -1454,8 +1454,11 @@ GL_RenderWritePixels(SDL_Renderer * renderer, const SDL_Rect * rect,
Uint32 pixel_format, const void * pixels, int pitch) Uint32 pixel_format, const void * pixels, int pitch)
{ {
GL_RenderData *data = (GL_RenderData *) renderer->driverdata; GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
SDL_Window *window = SDL_GetWindowFromID(renderer->window);
GLint internalFormat; GLint internalFormat;
GLenum format, type; GLenum format, type;
Uint8 *src, *dst, *tmp;
int length, rows;
if (!convert_format(data, pixel_format, &internalFormat, &format, &type)) { if (!convert_format(data, pixel_format, &internalFormat, &format, &type)) {
/* FIXME: Do a temp copy to a format that is supported */ /* FIXME: Do a temp copy to a format that is supported */
@ -1463,8 +1466,6 @@ GL_RenderWritePixels(SDL_Renderer * renderer, const SDL_Rect * rect,
return -1; return -1;
} }
/* FIXME: We need to copy the data and flip it */
if (pixel_format == SDL_PIXELFORMAT_INDEX1LSB) { if (pixel_format == SDL_PIXELFORMAT_INDEX1LSB) {
data->glPixelStorei(GL_UNPACK_LSB_FIRST, 1); data->glPixelStorei(GL_UNPACK_LSB_FIRST, 1);
} else if (pixel_format == SDL_PIXELFORMAT_INDEX1MSB) { } else if (pixel_format == SDL_PIXELFORMAT_INDEX1MSB) {
@ -1474,8 +1475,21 @@ GL_RenderWritePixels(SDL_Renderer * renderer, const SDL_Rect * rect,
data->glPixelStorei(GL_UNPACK_ROW_LENGTH, data->glPixelStorei(GL_UNPACK_ROW_LENGTH,
(pitch / bytes_per_pixel(pixel_format))); (pitch / bytes_per_pixel(pixel_format)));
data->glRasterPos2i(rect->x, rect->y); /* Flip the rows to be bottom-up */
data->glDrawPixels(rect->w, rect->h, format, type, pixels); length = rect->h * rect->w * pitch;
tmp = SDL_stack_alloc(Uint8, length);
src = (Uint8*)pixels + (rect->h-1)*pitch;
dst = (Uint8*)tmp;
rows = rect->h;
while (rows--) {
SDL_memcpy(dst, src, pitch);
dst += pitch;
src -= pitch;
}
data->glRasterPos2i(rect->x, (window->h-rect->y));
data->glDrawPixels(rect->w, rect->h, format, type, tmp);
SDL_stack_free(tmp);
return 0; return 0;
} }