Mesa (master): mesa: skip FLUSH_VERTICES() if no samplers were changed

[Timothy Arceri]

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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Fri Jun 23 08:56:40 2017 +1000

mesa: skip FLUSH_VERTICES() if no samplers were changed

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/main/uniform_query.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index afb9f566b8..928d3ce4fd 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -1079,7 +1079,12 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values,
       count = MIN2(count, (int) (uni->array_elements - offset));
    }
 
-   _mesa_flush_vertices_for_uniforms(ctx, uni);
+   /* We check samplers for changes and flush if needed in the sampler
+    * handling code further down, so just skip them here.
+    */
+   if (!uni->type->is_sampler()) {
+       _mesa_flush_vertices_for_uniforms(ctx, uni);
+   }
 
    /* Store the data in the "actual type" backing storage for the uniform.
     */