Mesa (master): st/mesa: move st_validate_state() call earlier in st_DrawPixels()
Brian Paul
brianp at kemper.freedesktop.org
Tue Jun 19 22:08:27 UTC 2012
Module: Mesa
Branch: master
Commit: 7f4786ad29abbbbc4b0ebfcec8114921c1c8f6e3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f4786ad29abbbbc4b0ebfcec8114921c1c8f6e3
Author: Brian Paul <brianp at vmware.com>
Date: Tue Jun 19 09:40:32 2012 -0600
st/mesa: move st_validate_state() call earlier in st_DrawPixels()
---
src/mesa/state_tracker/st_cb_drawpixels.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index d3f8d13..aba9165 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -1073,6 +1073,11 @@ st_DrawPixels(struct gl_context *ctx, GLint x, GLint y,
int num_sampler_view = 1;
struct st_fp_variant *fpv;
+ /* Mesa state should be up to date by now */
+ assert(ctx->NewState == 0x0);
+
+ st_validate_state(st);
+
if (format == GL_DEPTH_STENCIL)
write_stencil = write_depth = GL_TRUE;
else if (format == GL_STENCIL_INDEX)
@@ -1088,11 +1093,6 @@ st_DrawPixels(struct gl_context *ctx, GLint x, GLint y,
return;
}
- /* Mesa state should be up to date by now */
- assert(ctx->NewState == 0x0);
-
- st_validate_state(st);
-
/*
* Get vertex/fragment shaders
*/
More information about the mesa-commit
mailing list