projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b4f0ab0
)
st/mesa: move st_validate_state() call earlier in st_DrawPixels()
author
Brian Paul
<brianp@vmware.com>
Tue, 19 Jun 2012 15:40:32 +0000
(09:40 -0600)
committer
Brian Paul
<brianp@vmware.com>
Tue, 19 Jun 2012 20:40:44 +0000
(14:40 -0600)
src/mesa/state_tracker/st_cb_drawpixels.c
patch
|
blob
|
history
diff --git
a/src/mesa/state_tracker/st_cb_drawpixels.c
b/src/mesa/state_tracker/st_cb_drawpixels.c
index d3f8d1368955e4b71bb73ce3f8375cd46dec3d26..aba91650252a906339dc97d9d1ae8a7540993fc3 100644
(file)
--- 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
*/