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

zink: fix big tcs output io

Browse source 
as in the producer case, big io needs to reserve the appropriate number
of slots

fixes:
spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-float-index-rd-after-barrier,Fail
spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-float-index-wr-before-barrier,Fail
spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-vec2-index-rd-after-barrier,Fail
spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-vec2-index-wr-before-barrier,Fail
spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-vec3-index-rd-after-barrier,Fail
spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-vec3-index-wr-before-barrier,Fail
spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-vec4-index-rd-after-barrier,Fail
spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-vec4-index-wr-before-barrier,Fail

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24568>
(cherry picked from commit ee6ba2bb57)
This commit is contained in:
Mike Blumenkrantz 2023-08-02 17:21:41 -04:00 • committed by Eric Engestrom
parent 6029e2d7c2
commit 54067b533a
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -40,7 +40,7 @@
"description": "zink: fix big tcs output io",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

11
src/gallium/drivers/zink/zink_compiler.c
View file

@ -2659,11 +2659,18 @@ assign_consumer_var_io(gl_shader_stage stage, nir_variable *var, unsigned *reser
var->data.driver_location = -1;
return true;
}
/* patch variables may be read in the workgroup */
if (stage != MESA_SHADER_TESS_CTRL)
/* dead io */
return false;
/* patch variables may be read in the workgroup */
slot_map[slot] = (*reserved)++;
unsigned num_slots;
if (nir_is_arrayed_io(var, stage))
num_slots = glsl_count_vec4_slots(glsl_get_array_element(var->type), false, false);
else
num_slots = glsl_count_vec4_slots(var->type, false, false);
assert(*reserved + num_slots <= MAX_VARYING);
for (unsigned i = 0; i < num_slots; i++)
slot_map[slot + i] = (*reserved)++;
}
var->data.driver_location = slot_map[slot];
}