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

gallivm/nir: fix image store conversions

Browse source 
This fixes a few of the image store paths, to do the
correct clamping of unsigned/signed values

Fixes: KHR-GLES31.core.layout_binding.block_layout_binding_block_ComputeShader
KHR-GL45.shader_image_load_store.basic-allFormats-store
KHR-GL46.shader_image_load_store.multiple-uniforms

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4574>
This commit is contained in:
Dave Airlie 2020-04-07 15:06:26 +10:00
parent bf3c9d2770
commit 13e5f331db
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gallium/auxiliary/gallivm/lp_bld_format_soa.c
View file

@ -879,17 +879,23 @@ lp_build_insert_soa_chan(struct lp_build_context *bld,
struct lp_type type = bld->type; struct lp_type type = bld->type;
const unsigned width = chan_desc.size; const unsigned width = chan_desc.size;
const unsigned start = chan_desc.shift; const unsigned start = chan_desc.shift;
const uint32_t chan_mask = (1ULL << width) - 1;
ASSERTED const unsigned stop = start + width; ASSERTED const unsigned stop = start + width;
LLVMValueRef chan = NULL; LLVMValueRef chan = NULL;
switch(chan_desc.type) { switch(chan_desc.type) {
case UTIL_FORMAT_TYPE_UNSIGNED: case UTIL_FORMAT_TYPE_UNSIGNED:
if (chan_desc.pure_integer) if (chan_desc.pure_integer) {
chan = LLVMBuildBitCast(builder, rgba, bld->int_vec_type, ""); chan = LLVMBuildBitCast(builder, rgba, bld->int_vec_type, "");
LLVMValueRef mask_val = lp_build_const_int_vec(gallivm, type, chan_mask);
LLVMValueRef mask = LLVMBuildICmp(builder, LLVMIntUGT, chan, mask_val, "");
chan = LLVMBuildSelect(builder, mask, mask_val, chan, "");
}
else if (type.floating) { else if (type.floating) {
if (chan_desc.normalized) if (chan_desc.normalized) {
rgba = lp_build_clamp(bld, rgba, bld->zero, bld->one);
chan = lp_build_clamped_float_to_unsigned_norm(gallivm, type, width, rgba); chan = lp_build_clamped_float_to_unsigned_norm(gallivm, type, width, rgba);
else } else
chan = LLVMBuildFPToSI(builder, rgba, bld->vec_type, ""); chan = LLVMBuildFPToSI(builder, rgba, bld->vec_type, "");
} }
if (start) if (start)
@ -901,10 +907,10 @@ lp_build_insert_soa_chan(struct lp_build_context *bld,
*output = LLVMBuildOr(builder, *output, chan, ""); *output = LLVMBuildOr(builder, *output, chan, "");
break; break;
case UTIL_FORMAT_TYPE_SIGNED: case UTIL_FORMAT_TYPE_SIGNED:
if (chan_desc.pure_integer) if (chan_desc.pure_integer) {
chan = LLVMBuildBitCast(builder, rgba, bld->int_vec_type, ""); chan = LLVMBuildBitCast(builder, rgba, bld->int_vec_type, "");
else if (type.floating) { chan = LLVMBuildAnd(builder, chan, lp_build_const_int_vec(gallivm, type, chan_mask), "");
uint32_t mask_val = (1UL << chan_desc.size) - 1; } else if (type.floating) {
if (chan_desc.normalized) { if (chan_desc.normalized) {
char intrin[32]; char intrin[32];
double scale = ((1 << (chan_desc.size - 1)) - 1); double scale = ((1 << (chan_desc.size - 1)) - 1);
@ -915,7 +921,7 @@ lp_build_insert_soa_chan(struct lp_build_context *bld,
rgba = lp_build_intrinsic_unary(builder, intrin, bld->vec_type, rgba); rgba = lp_build_intrinsic_unary(builder, intrin, bld->vec_type, rgba);
} }
chan = LLVMBuildFPToSI(builder, rgba, bld->int_vec_type, ""); chan = LLVMBuildFPToSI(builder, rgba, bld->int_vec_type, "");
chan = LLVMBuildAnd(builder, chan, lp_build_const_int_vec(gallivm, type, mask_val), ""); chan = LLVMBuildAnd(builder, chan, lp_build_const_int_vec(gallivm, type, chan_mask), "");
} }
if (start) if (start)
chan = LLVMBuildShl(builder, chan, chan = LLVMBuildShl(builder, chan,