fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 17:30:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

nir: mark XFB varyings as unmoveable to prevent them to be remapped

Browse source 
XFB varyings are considered as always active IO to prevent them to
be removed or compacted. Though, if the NIR linker doesn't mark XFB
varyings as unmoveable it still possible to remap other varyings to
the same location/component.

Fixes KHR-Single-GL46.enhanced_layouts.xfb_override_qualifiers_with_api
with Zink and a bunch of other dEQP XFB tests.

Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6301
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri  <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16092>
(cherry picked from commit 4ebb5391ac)

Conflicts:
	src/gallium/drivers/zink/ci/zink-radv-fails.txt
This commit is contained in:
Samuel Pitoiset 2022-04-22 10:13:56 +02:00 • committed by Dylan Baker
parent add1e87c4e
commit c203721116
3 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -634,7 +634,7 @@
"description": "nir: mark XFB varyings as unmoveable to prevent them to be remapped",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

3
src/compiler/nir/nir_linking_helpers.c
View file

@ -310,7 +310,8 @@ get_unmoveable_components_masks(nir_shader *shader,
/* If we can pack this varying then don't mark the components as
* used.
*/
if (is_packing_supported_for_type(type))
if (is_packing_supported_for_type(type) &&
!var->data.always_active_io)
continue;
unsigned location = var->data.location - VARYING_SLOT_VAR0;

17
src/gallium/drivers/zink/ci/zink-radv-fails.txt
View file

@ -49,16 +49,6 @@ KHR-GL46.shader_image_load_store.non-layered_binding,Fail
# amd issue #6305
KHR-GL46.shader_ballot_tests.ShaderBallotFunctionRead,Fail
# radv issue #6301
KHR-Single-GL46.enhanced_layouts.varying_array_components,Fail
KHR-Single-GL46.enhanced_layouts.varying_array_locations,Fail
KHR-Single-GL46.enhanced_layouts.varying_components,Fail
KHR-Single-GL46.enhanced_layouts.varying_locations,Fail
KHR-Single-GL46.enhanced_layouts.varying_structure_locations,Fail
KHR-Single-GL46.enhanced_layouts.xfb_override_qualifiers_with_api,Fail
dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_center,Fail
dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner,Fail
dEQP-GLES2.functional.clipping.point.wide_point_clip,Fail
@ -194,13 +184,6 @@ dEQP-GLES3.functional.shaders.metamorphic.bubblesort_flag.variant_1,Fail
dEQP-GLES3.functional.shaders.metamorphic.bubblesort_flag.variant_2,Fail
dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler2dshadow_vertex,Fail
dEQP-GLES3.functional.shaders.texture_functions.textureprojoffset.sampler2dshadow_vertex,Fail
dEQP-GLES3.functional.transform_feedback.random_full_array_capture.separate.lines.6,Fail
dEQP-GLES3.functional.transform_feedback.random_full_array_capture.separate.points.3,Fail
dEQP-GLES3.functional.transform_feedback.random_full_array_capture.separate.points.6,Fail
dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.7,Fail
dEQP-GLES3.functional.transform_feedback.random.separate.lines.6,Fail
dEQP-GLES3.functional.transform_feedback.random.separate.points.6,Fail
dEQP-GLES3.functional.transform_feedback.random.separate.triangles.6,Fail
# cubes are hard #6270
spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() cube,Fail