From b684ba6ce7fc6cabf42132559192e1065891e67a Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Wed, 12 Feb 2020 12:45:55 +0200 Subject: [PATCH] st/nir: Unify inputs_read/outputs_written before serializing NIR Otherwise input/output interfaces won't be unified when reading NIR from a cache. Fixes piglit test on iris: clip-distance-vs-gs-out.shader_test Fixes: 19ed12af Signed-off-by: Danylo Piliaiev Reviewed-by: Timothy Arceri Tested-by: Marge Bot Part-of: --- src/mesa/state_tracker/st_glsl_to_nir.cpp | 41 +++++++++++------------ 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 35464c982a6..796bfb0317e 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -793,6 +793,25 @@ st_link_nir(struct gl_context *ctx, } } + struct shader_info *prev_info = NULL; + + for (unsigned i = 0; i < num_shaders; i++) { + struct gl_linked_shader *shader = linked_shader[i]; + struct shader_info *info = &shader->Program->nir->info; + + if (prev_info && + ctx->Const.ShaderCompilerOptions[shader->Stage].NirOptions->unify_interfaces) { + prev_info->outputs_written |= info->inputs_read & + ~(VARYING_BIT_TESS_LEVEL_INNER | VARYING_BIT_TESS_LEVEL_OUTER); + info->inputs_read |= prev_info->outputs_written & + ~(VARYING_BIT_TESS_LEVEL_INNER | VARYING_BIT_TESS_LEVEL_OUTER); + + prev_info->patch_outputs_written |= info->patch_inputs_read; + info->patch_inputs_read |= prev_info->patch_outputs_written; + } + prev_info = info; + } + for (unsigned i = 0; i < num_shaders; i++) { struct gl_linked_shader *shader = linked_shader[i]; struct gl_program *prog = shader->Program; @@ -819,28 +838,6 @@ st_link_nir(struct gl_context *ctx, shader->ir = NULL; } - struct shader_info *prev_info = NULL; - - for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) { - struct gl_linked_shader *shader = shader_program->_LinkedShaders[i]; - if (!shader) - continue; - - struct shader_info *info = &shader->Program->nir->info; - - if (prev_info && - ctx->Const.ShaderCompilerOptions[i].NirOptions->unify_interfaces) { - prev_info->outputs_written |= info->inputs_read & - ~(VARYING_BIT_TESS_LEVEL_INNER | VARYING_BIT_TESS_LEVEL_OUTER); - info->inputs_read |= prev_info->outputs_written & - ~(VARYING_BIT_TESS_LEVEL_INNER | VARYING_BIT_TESS_LEVEL_OUTER); - - prev_info->patch_outputs_written |= info->patch_inputs_read; - info->patch_inputs_read |= prev_info->patch_outputs_written; - } - prev_info = info; - } - return true; } -- 2.30.2