summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Arceri <tarceri@itsqueeze.com>2017-06-23 08:44:25 +1000
committerTimothy Arceri <tarceri@itsqueeze.com>2017-06-27 09:17:16 +1000
commit191ff86d532924e5b66cad287e9f507c7a655dfb (patch)
treed3c51a653d2d262c8fed2b3acee6c4ad96671676
parentc4291a3283ae2bdb9a33c14d86294c8e843d3ce6 (diff)
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>
-rw-r--r--src/mesa/main/uniform_query.cpp6
1 files changed, 6 insertions, 0 deletions
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;