OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir_to_tgsi: Declare immediates as float on non-native-ints hardware.

Browse Source 
Makes the values more legible on i915g, and may keep us from tripping
asserts on nouveau's non-native-integer HW.

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11744>
This commit is contained in:
Emma Anholt
2021-07-06 12:29:58 -07:00
committed by Marge Bot
parent b4ad947135
commit f2ae76e1a6
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gallium/auxiliary/nir/nir_to_tgsi.c
View File

@@ -460,22 +460,32 @@ ntt_setup_registers(struct ntt_compile *c, struct exec_list *list)
static struct ureg_src
ntt_get_load_const_src(struct ntt_compile *c, nir_load_const_instr *instr)
{
uint32_t values[4];
int num_components = instr->def.num_components;
if (instr->def.bit_size == 32) {
if (!c->native_integers) {
float values[4];
assert(instr->def.bit_size == 32);
for (int i = 0; i < num_components; i++)
values[i] = instr->value[i].u32;
} else {
assert(num_components <= 2);
for (int i = 0; i < num_components; i++) {
values[i * 2 + 0] = instr->value[i].u64 & 0xffffffff;
values[i * 2 + 1] = instr->value[i].u64 >> 32;
}
num_components *= 2;
}
values[i] = uif(instr->value[i].u32);
return ureg_DECL_immediate_uint(c->ureg, values, num_components);
return ureg_DECL_immediate(c->ureg, values, num_components);
} else {
uint32_t values[4];
if (instr->def.bit_size == 32) {
for (int i = 0; i < num_components; i++)
values[i] = instr->value[i].u32;
} else {
assert(num_components <= 2);
for (int i = 0; i < num_components; i++) {
values[i * 2 + 0] = instr->value[i].u64 & 0xffffffff;
values[i * 2 + 1] = instr->value[i].u64 >> 32;
}
num_components *= 2;
}
return ureg_DECL_immediate_uint(c->ureg, values, num_components);
}
}
static struct ureg_src