fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: exclude layer when recomputing FS input bases

Browse source 
This is always exported as a sysval.

Closes: mesa/mesa#12501
Fixes: dd00b3f5 ("radv: Implement FS layer ID input as a system value.")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33168>
This commit is contained in:
Samuel Pitoiset 2025-01-23 08:31:06 +01:00 • committed by Marge Bot
parent 2e4dcf72c6
commit 4b741338ac
5 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/amd/vulkan/nir/radv_nir_lower_io.c
View file

@ -113,13 +113,13 @@ radv_recompute_fs_input_bases_callback(UNUSED nir_builder *b, nir_intrinsic_inst
bool
radv_recompute_fs_input_bases(nir_shader *nir)
{
const uint64_t always_per_vertex =
nir->info.inputs_read & ~nir->info.per_primitive_inputs & ~(VARYING_BIT_PRIMITIVE_ID | VARYING_BIT_VIEWPORT);
const uint64_t always_per_vertex = nir->info.inputs_read & ~nir->info.per_primitive_inputs &
~(VARYING_BIT_PRIMITIVE_ID | VARYING_BIT_VIEWPORT | VARYING_BIT_LAYER);
const uint64_t potentially_per_primitive = nir->info.inputs_read & (VARYING_BIT_PRIMITIVE_ID | VARYING_BIT_VIEWPORT);
const uint64_t always_per_primitive =
nir->info.inputs_read & nir->info.per_primitive_inputs & ~(VARYING_BIT_PRIMITIVE_ID | VARYING_BIT_VIEWPORT);
const uint64_t always_per_primitive = nir->info.inputs_read & nir->info.per_primitive_inputs &
~(VARYING_BIT_PRIMITIVE_ID | VARYING_BIT_VIEWPORT | VARYING_BIT_LAYER);
radv_recompute_fs_input_bases_state s = {
.always_per_vertex = always_per_vertex,

3
src/gallium/drivers/zink/ci/zink-radv-navi10-flakes.txt
View file

@ -44,6 +44,3 @@ KHR-GL46.sparse_buffer_tests.BufferStorageTest
dEQP-GLES3.functional.fbo.multiview.samples_4
spec@glsl-1.50@execution@redeclare-pervertex-out-subset-gs
dEQP-GLES31.functional.synchronization.inter_call.without_memory_barrier.ssbo_atomic_counter_mixed_dispatch_100_calls_128_invocations
# https://gitlab.freedesktop.org/mesa/mesa/-/issues/12501
spec@arb_fragment_layer_viewport@layer-gs-writes-in-range

3
src/gallium/drivers/zink/ci/zink-radv-navi31-flakes.txt
View file

@ -59,6 +59,3 @@ spec@glsl-1.50@execution@redeclare-pervertex-out-subset-gs
# First seen on navi10 in https://gitlab.freedesktop.org/mesa/mesa/-/jobs/58636780
KHR-GL46.sparse_buffer_tests.BufferStorageTest
# https://gitlab.freedesktop.org/mesa/mesa/-/issues/12501
spec@arb_fragment_layer_viewport@layer-gs-writes-in-range

3
src/gallium/drivers/zink/ci/zink-radv-polaris10-flakes.txt
View file

@ -50,6 +50,3 @@ spec@arb_query_buffer_object@coherency@indirect-draw-GL_GEOMETRY_SHADER_PRIMITIV
spec@arb_query_buffer_object@coherency@indirect-draw-count-GL_GEOMETRY_SHADER_INVOCATIONS
spec@arb_query_buffer_object@coherency@indirect-draw-count-GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED
spec@ext_timer_query@time-elapsed
# https://gitlab.freedesktop.org/mesa/mesa/-/issues/12501
spec@arb_fragment_layer_viewport@layer-gs-writes-in-range

3
src/gallium/drivers/zink/ci/zink-radv-vangogh-flakes.txt
View file

@ -103,6 +103,3 @@ dEQP-GLES31.functional.copy_image.mixed.viewclass_64_bits_mixed.rg32f_r11_eac.te
dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_100x100_drawcount_200
dEQP-GLES31.functional.draw_indirect.compute_interop.large.drawelements_separate_grid_1200x1200_drawcount_1
spec@arb_compute_shader@zero-dispatch-size
# https://gitlab.freedesktop.org/mesa/mesa/-/issues/12501
spec@arb_fragment_layer_viewport@layer-gs-writes-in-range