zink: link up vs COLx vars -> fs BFCx
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
macOS-CI / macOS-CI (xlib) (push) Waiting to run

this fixes some twoside tests

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41863>
This commit is contained in:
Mike Blumenkrantz 2026-05-27 12:39:10 -04:00 committed by Marge Bot
parent a5146fc0a9
commit caf2c32f42
6 changed files with 10 additions and 5 deletions

View file

@ -149,7 +149,6 @@ spec@ext_transform_feedback@tessellation quad_strip wireframe,Fail
# uprev Piglit in Mesa
spec@!opengl 1.1@large-tex,Fail
spec@!opengl 1.1@large-tex@test_clear_tex_sub_image,Fail
spec@glsl-1.30@execution@glsl-packed-back-color,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail
spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode full precision,Fail

View file

@ -44,5 +44,4 @@ spec@arb_pipeline_statistics_query@arb_pipeline_statistics_query-clip,Fail
# uprev Piglit in Mesa
spec@!opengl 1.1@large-tex,Fail
spec@!opengl 1.1@large-tex@test_clear_tex_sub_image,Fail
spec@glsl-1.30@execution@glsl-packed-back-color,Fail

View file

@ -40,5 +40,4 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88
# uprev Piglit in Mesa
spec@!opengl 1.1@large-tex,Fail
spec@!opengl 1.1@large-tex@test_clear_tex_sub_image,Fail
spec@glsl-1.30@execution@glsl-packed-back-color,Fail

View file

@ -11,4 +11,3 @@ spec@arb_query_buffer_object@qbo@query-GL_GEOMETRY_SHADER_INVOCATIONS-ASYNC-GL_U
spec@arb_query_buffer_object@qbo@query-GL_GEOMETRY_SHADER_INVOCATIONS-SYNC-GL_INT,Fail
spec@arb_query_buffer_object@qbo@query-GL_GEOMETRY_SHADER_INVOCATIONS-SYNC-GL_UNSIGNED_INT,Fail
spec@arb_query_buffer_object@qbo@query-GL_GEOMETRY_SHADER_INVOCATIONS-SYNC-GL_UNSIGNED_INT64_ARB,Fail
spec@glsl-1.30@execution@glsl-packed-back-color,Fail

View file

@ -211,5 +211,4 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode ful
spec@!opengl 1.1@large-tex,Fail
spec@!opengl 1.1@large-tex@test_clear_tex_sub_image,Fail
spec@!opengl 1.1@large-tex@test_image_load_store,Fail
spec@glsl-1.30@execution@glsl-packed-back-color,Fail

View file

@ -2699,6 +2699,16 @@ assign_consumer_var_io(mesa_shader_stage stage, nir_variable *var, struct io_slo
slot -= VARYING_SLOT_PATCH0;
}
uint8_t *slot_map = var->data.patch ? io->patch_slot_map : io->slot_map;
if (slot_map[slot] == (unsigned char)-1) {
switch (slot) {
case VARYING_SLOT_COL0:
case VARYING_SLOT_COL1:
slot += VARYING_SLOT_BFC0 - 1;
break;
default:
break;
}
}
if (slot_map[slot] == (unsigned char)-1) {
/* texcoords can't be eliminated in fs due to GL_COORD_REPLACE,
* so keep for now and eliminate later