From 58fd54b56e20ecb43f824841877cf35e4d5926c3 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 17 Sep 2025 11:35:38 -0400 Subject: [PATCH] anv,hasvk: do not use unify_interfaces it's GLSL cruft we want to get rid of. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Kenneth Graunke Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_shader_compile.c | 4 +--- src/intel/vulkan_hasvk/anv_pipeline.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/intel/vulkan/anv_shader_compile.c b/src/intel/vulkan/anv_shader_compile.c index 7a2c171dedc..2cd612cffad 100644 --- a/src/intel/vulkan/anv_shader_compile.c +++ b/src/intel/vulkan/anv_shader_compile.c @@ -1554,8 +1554,6 @@ anv_shaders_post_lower_gfx(struct anv_device *device, uint32_t shader_count, const struct vk_graphics_pipeline_state *state) { - const struct brw_compiler *compiler = device->physical->compiler; - struct vk_shader_compile_info *prev_stage = NULL; for (uint32_t s = 0; s < shader_count; s++) { struct anv_shader_data *shader_data = &shaders_data[s]; @@ -1563,7 +1561,7 @@ anv_shaders_post_lower_gfx(struct anv_device *device, struct shader_info *cur_info = &shader_data->info->nir->info; - if (prev_stage && compiler->nir_options[info->stage].unify_interfaces) { + if (prev_stage && info->stage < MESA_SHADER_FRAGMENT) { struct shader_info *prev_info = &prev_stage->nir->info; prev_info->outputs_written |= cur_info->inputs_read & diff --git a/src/intel/vulkan_hasvk/anv_pipeline.c b/src/intel/vulkan_hasvk/anv_pipeline.c index 50a2dc24486..c271db2bafe 100644 --- a/src/intel/vulkan_hasvk/anv_pipeline.c +++ b/src/intel/vulkan_hasvk/anv_pipeline.c @@ -1310,7 +1310,7 @@ anv_graphics_pipeline_compile(struct anv_graphics_pipeline *pipeline, anv_pipeline_lower_nir(&pipeline->base, stage_ctx, &stages[s], layout); - if (prev_stage && compiler->nir_options[s]->unify_interfaces) { + if (prev_stage && s < MESA_SHADER_FRAGMENT) { prev_stage->nir->info.outputs_written |= stages[s].nir->info.inputs_read & ~(VARYING_BIT_TESS_LEVEL_INNER | VARYING_BIT_TESS_LEVEL_OUTER); stages[s].nir->info.inputs_read |= prev_stage->nir->info.outputs_written &