fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 09:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv,hasvk: do not use unify_interfaces

Browse source 
it's GLSL cruft we want to get rid of.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37447>
This commit is contained in:
Alyssa Rosenzweig 2025-09-17 11:35:38 -04:00 • committed by Marge Bot
parent bbf5bc8632
commit 58fd54b56e
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/intel/vulkan/anv_shader_compile.c
View file

@ -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 &

2
src/intel/vulkan_hasvk/anv_pipeline.c
View file

@ -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 &