From 8af2a099569f123776a9556affde23ae66a10ef5 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 21 Oct 2015 21:45:49 -0700 Subject: [PATCH] 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. --- src/vulkan/anv_pipeline.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; } -- 2.30.2