From: Alejandro Piñeiro <apinheiro@igalia.com>
Date: Thu, 30 Nov 2017 11:50:24 +0000 (+0100)
Subject: i965: call to gl_nir_link_uniform_blocks
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cae501b394131f51428860a6735bc62f72684343;p=mesa.git

i965: call to gl_nir_link_uniform_blocks

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).

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp
index 1c2025f7c1b..e4e0b5fe330 100644
--- a/src/mesa/drivers/dri/i965/brw_link.cpp
+++ b/src/mesa/drivers/dri/i965/brw_link.cpp
@@ -269,6 +269,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;