summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-11-17 05:01:26 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-11-17 05:01:26 +0000
commit948ab5d8a926d55615a4bfbdfc1e9668095dc81c (patch)
tree052e66377aa528dd691d61732850b27c5191b3f3 /src/mesa
parent74e9a43a2ad2d683c21be8c6b874f5520dbfb5df (diff)
move _mesa_update_state() calls before error tests that depend on framebuffer completeness
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/drawpix.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index a95ee02097..638679e845 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -149,15 +149,15 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
return;
}
+ if (ctx->NewState) {
+ _mesa_update_state(ctx);
+ }
+
if (error_check_format_type(ctx, format, type, GL_TRUE)) {
/* found an error */
return;
}
- if (ctx->NewState) {
- _mesa_update_state(ctx);
- }
-
if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
_mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
"glDrawPixels(incomplete framebuffer)" );
@@ -199,6 +199,10 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+ if (ctx->NewState) {
+ _mesa_update_state(ctx);
+ }
+
if (ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glCopyPixels (invalid fragment program)");
@@ -249,10 +253,6 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
return;
}
- if (ctx->NewState) {
- _mesa_update_state(ctx);
- }
-
if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT ||
ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
_mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
@@ -304,14 +304,14 @@ _mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
return;
}
+ if (ctx->NewState)
+ _mesa_update_state(ctx);
+
if (error_check_format_type(ctx, format, type, GL_FALSE)) {
/* found an error */
return;
}
- if (ctx->NewState)
- _mesa_update_state(ctx);
-
if (ctx->ReadBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
_mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
"glReadPixels(incomplete framebuffer)" );