Mesa (master): mesa: don' t set _NEW_PROGRAM_CONSTANTS for non-bindless opaque uniforms

[Timothy Arceri]

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

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

mesa: don't set _NEW_PROGRAM_CONSTANTS for non-bindless opaque uniforms

v2: rebase on new _mesa_flush_vertices_for_uniforms() helper

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

---

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

diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 5eb0efc326..afb9f566b8 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -1006,6 +1006,12 @@ void
 _mesa_flush_vertices_for_uniforms(struct gl_context *ctx,
                                   const struct gl_uniform_storage *uni)
 {
+   /* Opaque uniforms have no storage unless they are bindless */
+   if (!uni->is_bindless && uni->type->contains_opaque()) {
+      FLUSH_VERTICES(ctx, 0);
+      return;
+   }
+
    uint64_t new_driver_state = 0;
    unsigned mask = uni->active_shader_mask;