i965: Link uniforms of SPIR-V programs using the NIR linker

Igalia · Nov 20, 2017 · 968c17d · 968c17d
1 parent e211e2b
commit 968c17d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp
@@ -28,6 +28,7 @@
 #include "compiler/glsl/ir_optimization.h"
 #include "compiler/glsl/program.h"
 #include "compiler/nir/nir_serialize.h"
+#include "compiler/nir/nir_linker.h"
 #include "program/program.h"
 #include "main/mtypes.h"
 #include "main/shaderapi.h"
@@ -258,6 +259,11 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg)
                                  compiler->scalar_stage[stage]);
    }
 
+   /* SPIR-V programs use a NIR linker */
+   if (shProg->data->spirv) {
+      nir_link_uniforms(ctx, shProg);
+   }
+
    /* Determine first and last stage. */
    unsigned first = MESA_SHADER_STAGES;
    unsigned last = 0;