AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: handle culldistance xfb outputs like clipdistance

Browse Source 
fixes:
spec@ext_transform_feedback@builtin-varyings gl_culldistance

cc: mesa-stable

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18724>
This commit is contained in:
Mike Blumenkrantz
2022-09-22 15:33:48 -04:00
committed by Marge Bot
parent 1146793881
commit 21ba47c821
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/ci/zink-lvp-fails.txt
-3
View File
@@ -347,6 +347,3 @@ spec@glsl-4.00@execution@conversion@vert-conversion-explicit-dvec2-vec2,Fail
spec@glsl-4.00@execution@conversion@vert-conversion-explicit-dvec3-vec3,Fail
spec@glsl-4.00@execution@conversion@vert-conversion-explicit-dvec4-vec4,Fail
spec@glsl-4.50@execution@ssbo-atomiccompswap-int,Fail
# https://gitlab.freedesktop.org/mesa/mesa/-/issues/7152
spec@ext_transform_feedback@builtin-varyings gl_culldistance,Fail
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+2 -2
View File
@@ -1657,7 +1657,7 @@ emit_so_outputs(struct ntv_context *ctx,
for (unsigned c = 0; c < so_output.num_components; c++) {
components[c] = so_output.start_component + c;
/* this is the second half of a 2 * vec4 array */
if (slot == VARYING_SLOT_CLIP_DIST1)
if (slot == VARYING_SLOT_CLIP_DIST1 || slot == VARYING_SLOT_CULL_DIST1)
components[c] += 4;
}
/* OpVectorShuffle can select vector members into a differently-sized vector */
@@ -1688,7 +1688,7 @@ emit_so_outputs(struct ntv_context *ctx,
uint32_t member = so_output.start_component + c;
SpvId base_type = get_glsl_basetype(ctx, glsl_get_base_type(bare_type));
if (slot == VARYING_SLOT_CLIP_DIST1)
if (slot == VARYING_SLOT_CLIP_DIST1 || slot == VARYING_SLOT_CULL_DIST1)
member += 4;
components[idx] = spirv_builder_emit_composite_extract(&ctx->builder, base_type, src, &member, 1);
if (glsl_type_is_64bit(bare_type)) {