summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorEduardo Lima Mitev <[email protected]>2017-11-14 17:44:39 +0100
committerAlejandro Piñeiro <[email protected]>2018-06-21 14:25:05 +0200
commit77e790f99a5c6ee7b9687149b944ca4fb4a8ff9b (patch)
tree65f90ec5d1cdc19ad4e53fdf2729836c5d85ebef /src/mesa/drivers/dri
parentae0208e5b4ed75a8abd7c338db18952067f4d56e (diff)
i965: Link uniforms of SPIR-V programs using the NIR linker
v2: nir_link_uniforms renamed to gl_nir_link_uniforms Signed-off-by: Eduardo Lima <[email protected]> Signed-off-by: Alejandro Piñeiro <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i965/brw_link.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp
index c75721c06ca..8bc97fa4f3e 100644
--- a/src/mesa/drivers/dri/i965/brw_link.cpp
+++ b/src/mesa/drivers/dri/i965/brw_link.cpp
@@ -261,6 +261,12 @@ 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) {
+ if (!gl_nir_link_uniforms(ctx, shProg))
+ return false;
+ }
+
/* Determine first and last stage. */
unsigned first = MESA_SHADER_STAGES;
unsigned last = 0;