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

zink: don't bitcast bool deref loads/stores

Browse source 
a bool can only be a bool, and OpBitCast requires the src type to be
different than the dst type, so this is illegal

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22577>
(cherry picked from commit 9bf4db8ebb)
This commit is contained in:
Mike Blumenkrantz 2023-03-28 14:54:28 -04:00 • committed by Dylan Baker
parent f1dc6e752a
commit 53f0dd5362
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2674,7 +2674,7 @@
"description": "zink: don't bitcast bool deref loads/stores",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

5
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View file

@ -2477,7 +2477,8 @@ emit_load_deref(struct ntv_context *ctx, nir_intrinsic_instr *intr)
result = spirv_builder_emit_load(&ctx->builder, type, ptr);
unsigned num_components = nir_dest_num_components(intr->dest);
unsigned bit_size = nir_dest_bit_size(intr->dest);
result = bitcast_to_uvec(ctx, result, bit_size, num_components);
if (bit_size > 1)
result = bitcast_to_uvec(ctx, result, bit_size, num_components);
store_dest(ctx, &intr->dest, result, nir_type_uint);
}
@ -2526,6 +2527,8 @@ emit_store_deref(struct ntv_context *ctx, nir_intrinsic_instr *intr)
src = emit_bitcast(ctx, type, src);
/* SampleMask is always an array in spirv, so we need to construct it into one */
result = spirv_builder_emit_composite_construct(&ctx->builder, ctx->sample_mask_type, &src, 1);
} else if (glsl_get_base_type(glsl_without_array(gtype)) == GLSL_TYPE_BOOL) {
result = src;
} else
result = emit_bitcast(ctx, type, src);
if (nir_intrinsic_access(intr) & ACCESS_COHERENT)