From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 22 Oct 2015 04:45:49 +0000 (-0700)
Subject: anv/pipeline: Make the has_push_constants computation more accurate
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8af2a099569f123776a9556affde23ae66a10ef5;p=mesa.git

anv/pipeline: Make the has_push_constants computation more accurate

The computation used to only look for uniforms that weren't samplers.  Now
it also filters out arrays of samplers.
---

diff --git a/src/vulkan/anv_pipeline.c b/src/vulkan/anv_pipeline.c
index 80f8a4ff76f..f035f5b8f5e 100644
--- a/src/vulkan/anv_pipeline.c
+++ b/src/vulkan/anv_pipeline.c
@@ -354,7 +354,11 @@ anv_pipeline_compile(struct anv_pipeline *pipeline,
 
    bool have_push_constants = false;
    nir_foreach_variable(var, &nir->uniforms) {
-      if (!glsl_type_is_sampler(var->type)) {
+      const struct glsl_type *type = var->type;
+      if (glsl_type_is_array(type))
+         type = glsl_get_array_element(type);
+
+      if (!glsl_type_is_sampler(type)) {
          have_push_constants = true;
          break;
       }