From 9f9628e9dd64b2bae62269cc4ebb0f920a5833c5 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 28 Aug 2015 22:31:03 -0700
Subject: [PATCH] vk/SPIR-V: Pull num_uniform_components out of the NIR shader

---
 src/vulkan/anv_compiler.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/vulkan/anv_compiler.cpp b/src/vulkan/anv_compiler.cpp
index 40cd4846857..b330b245870 100644
--- a/src/vulkan/anv_compiler.cpp
+++ b/src/vulkan/anv_compiler.cpp
@@ -940,9 +940,10 @@ anv_compile_shader_glsl(struct anv_compiler *compiler,
 }
 
 static void
-setup_nir_io(struct gl_program *prog,
+setup_nir_io(struct gl_shader *mesa_shader,
              nir_shader *shader)
 {
+   struct gl_program *prog = mesa_shader->Program;
    foreach_list_typed(nir_variable, var, node, &shader->inputs) {
       prog->InputsRead |= BITFIELD64_BIT(var->data.location);
    }
@@ -950,6 +951,8 @@ setup_nir_io(struct gl_program *prog,
    foreach_list_typed(nir_variable, var, node, &shader->outputs) {
       prog->OutputsWritten |= BITFIELD64_BIT(var->data.location);
    }
+
+   mesa_shader->num_uniform_components = shader->num_uniforms;
 }
 
 static void
@@ -1008,7 +1011,7 @@ anv_compile_shader_spirv(struct anv_compiler *compiler,
                    compiler->screen->devinfo,
                    NULL, mesa_shader->Stage, is_scalar);
 
-   setup_nir_io(mesa_shader->Program, mesa_shader->Program->nir);
+   setup_nir_io(mesa_shader, mesa_shader->Program->nir);
 
    fail_if(mesa_shader->Program->nir == NULL,
            "failed to translate SPIR-V to NIR\n");
-- 
2.30.2