From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Thu, 22 Jun 2017 22:44:25 +0000 (+1000)
Subject: mesa: don't set _NEW_PROGRAM_CONSTANTS for non-bindless opaque uniforms
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=191ff86d532924e5b66cad287e9f507c7a655dfb;p=mesa.git

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@amd.com>
---

diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 5eb0efc3268..afb9f566b80 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;