Mesa (master): st/mesa: don't update atomic, SSBO, UBO and TBO states that have no effect

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 085aa7f91e82dfeb08dd6fb0655df3e229816db3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=085aa7f91e82dfeb08dd6fb0655df3e229816db3

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Aug  2 18:38:45 2016 +0200

st/mesa: don't update atomic, SSBO, UBO and TBO states that have no effect

Tested-by: Edmondo Tommasina <edmondo.tommasina at gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/mesa/state_tracker/st_atom.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c
index dddc5ff..94e012a 100644
--- a/src/mesa/state_tracker/st_atom.c
+++ b/src/mesa/state_tracker/st_atom.c
@@ -157,9 +157,12 @@ void st_validate_state( struct st_context *st, enum st_pipeline pipeline )
    uint64_t dirty, pipeline_mask;
    uint32_t dirty_lo, dirty_hi;
 
-   /* Get Mesa driver state. */
-   st->dirty |= st->ctx->NewDriverState & ST_ALL_STATES_MASK;
-   st->ctx->NewDriverState = 0;
+   /* Get Mesa driver state.
+    *
+    * Inactive states are shader states not used by shaders at the moment.
+    */
+   st->dirty |= ctx->NewDriverState & st->active_states & ST_ALL_STATES_MASK;
+   ctx->NewDriverState = 0;
 
    /* Get pipeline state. */
    switch (pipeline) {