Commit 87442cb4 authored by Sam Lantinga's avatar Sam Lantinga

Trying to figure out why the OpenGL tests are failing...

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404184
parent 200856fb
...@@ -314,7 +314,7 @@ SDL_PROC_UNUSED(void, glRasterPos4iv, (const GLint * v)) ...@@ -314,7 +314,7 @@ SDL_PROC_UNUSED(void, glRasterPos4iv, (const GLint * v))
SDL_PROC_UNUSED(void, glRasterPos4s, SDL_PROC_UNUSED(void, glRasterPos4s,
(GLshort x, GLshort y, GLshort z, GLshort w)) (GLshort x, GLshort y, GLshort z, GLshort w))
SDL_PROC_UNUSED(void, glRasterPos4sv, (const GLshort * v)) SDL_PROC_UNUSED(void, glRasterPos4sv, (const GLshort * v))
SDL_PROC_UNUSED(void, glReadBuffer, (GLenum mode)) SDL_PROC(void, glReadBuffer, (GLenum mode))
SDL_PROC(void, glReadPixels, SDL_PROC(void, glReadPixels,
(GLint x, GLint y, GLsizei width, GLsizei height, (GLint x, GLint y, GLsizei width, GLsizei height,
GLenum format, GLenum type, GLvoid * pixels)) GLenum format, GLenum type, GLvoid * pixels))
......
...@@ -1273,13 +1273,16 @@ GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, ...@@ -1273,13 +1273,16 @@ GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
} else if (pixel_format == SDL_PIXELFORMAT_INDEX1MSB) { } else if (pixel_format == SDL_PIXELFORMAT_INDEX1MSB) {
data->glPixelStorei(GL_PACK_LSB_FIRST, 0); data->glPixelStorei(GL_PACK_LSB_FIRST, 0);
} }
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 / bytes_per_pixel(pixel_format))); // (pitch / bytes_per_pixel(pixel_format)));
data->glReadBuffer(GL_FRONT);
memset(pixels, 0xff, rect->h*pitch);
data->glReadPixels(rect->x, rect->y+rect->h-1, rect->w, rect->h, data->glReadPixels(rect->x, rect->y+rect->h-1, rect->w, rect->h,
format, type, pixels); format, type, pixels);
#if 0
/* Flip the rows to be top-down */ /* Flip the rows to be top-down */
length = rect->w * bytes_per_pixel(pixel_format); length = rect->w * bytes_per_pixel(pixel_format);
src = (Uint8*)pixels + (rect->h-1)*pitch; src = (Uint8*)pixels + (rect->h-1)*pitch;
...@@ -1292,6 +1295,7 @@ GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, ...@@ -1292,6 +1295,7 @@ GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
SDL_memcpy(src, tmp, length); SDL_memcpy(src, tmp, length);
} }
SDL_stack_free(tmp); SDL_stack_free(tmp);
#endif
return 0; return 0;
} }
......
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