[Mesa-dev] [PATCH v2 25/28] i965: call to gl_nir_link_uniform_blocks

[Alejandro Piñeiro]

When using a SPIR-V shader. Note that needs to be done before linking
uniforms, so when creating the uniform storage entries, block_index
could be filled properly (among other things).
---
 src/mesa/drivers/dri/i965/brw_link.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp
index 03b32d1fe7a..d0179cc89a1 100644
--- a/src/mesa/drivers/dri/i965/brw_link.cpp
+++ b/src/mesa/drivers/dri/i965/brw_link.cpp
@@ -263,6 +263,10 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg)
 
    /* SPIR-V programs use a NIR linker */
    if (shProg->data->spirv) {
+      if (!gl_nir_link_uniform_blocks(ctx, shProg)) {
+         return GL_FALSE;
+      }
+
       if (!gl_nir_link_uniforms(ctx, shProg))
          return GL_FALSE;
 
-- 
2.14.1