summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2016-01-05 18:11:14 -0700
committerBrian Paul <brianp@vmware.com>2016-01-06 15:53:46 -0700
commit2cc52801c05a636ddd52cdef7df338f69607c6fe (patch)
treed1e60a315e5ac0cd752d49379b1bbf0b6b961b16
parentb6bcf0864138787c21b19cda3749c80c6ad74604 (diff)
st/mesa: be more careful about state validation in st_Bitmap()
If the only dirty state is mesa's _NEW_PROGRAM_CONSTANTS flag, we can skip state validation before drawing a bitmap since that state doesn't effect bitmap rendering. This further increases the performance of the ipers demo on llvmpipe to about what it was before commit 36c93a6fae27561. Reviewed-by: José Fonseca <jfonseca@vmware.com>
-rw-r--r--src/mesa/state_tracker/st_cb_bitmap.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index c2cbcbd6fc7..191f1443131 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -622,7 +622,14 @@ st_Bitmap(struct gl_context *ctx, GLint x, GLint y,
if (width == 0 || height == 0)
return;
- st_validate_state(st);
+ /* We only need to validate state of the st dirty flags are set or
+ * any non-_NEW_PROGRAM_CONSTANTS mesa flags are set. The VS we use
+ * for bitmap drawing uses no constants and the FS constants are
+ * explicitly uploaded in the draw_bitmap_quad() function.
+ */
+ if ((st->dirty.mesa & ~_NEW_PROGRAM_CONSTANTS) || st->dirty.st) {
+ st_validate_state(st);
+ }
if (!st->bitmap.vs) {
/* create pass-through vertex shader now */