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

radv: fix set_output_usage_mask() with composite and 64-bit types

Browse Source 
It previously used var->type instead of deref_instr->type and didn't
handle 64-bit outputs.

This fixes lots of transform feedback CTS tests involving transform
feedback and geometry shaders (mostly
dEQP-VK.transform_feedback.fuzz.random_geometry.*)

v2: fix writemask widening when comp != 0
v3: fix 64-bit variables when comp != 0, again

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Cc: 19.0 19.1 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Rhys Perry
2019-04-26 15:39:51 +01:00
parent 8194d3887e
commit 13c423629e
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/amd/vulkan/radv_shader_info.c
View File

@@ -112,6 +112,15 @@ gather_intrinsic_load_deref_info(const nir_shader *nir,
} }
} }
static uint32_t
widen_writemask(uint32_t wrmask)
{
uint32_t new_wrmask = 0;
for(unsigned i = 0; i < 4; i++)
new_wrmask |= (wrmask & (1 << i) ? 0x3 : 0x0) << (i * 2);
return new_wrmask;
}
static void static void
set_output_usage_mask(const nir_shader *nir, const nir_intrinsic_instr *instr, set_output_usage_mask(const nir_shader *nir, const nir_intrinsic_instr *instr,
uint8_t *output_usage_mask) uint8_t *output_usage_mask)
@@ -119,7 +128,7 @@ set_output_usage_mask(const nir_shader *nir, const nir_intrinsic_instr *instr,
nir_deref_instr *deref_instr = nir_deref_instr *deref_instr =
nir_instr_as_deref(instr->src[0].ssa->parent_instr); nir_instr_as_deref(instr->src[0].ssa->parent_instr);
nir_variable *var = nir_deref_instr_get_variable(deref_instr); nir_variable *var = nir_deref_instr_get_variable(deref_instr);
unsigned attrib_count = glsl_count_attribute_slots(var->type, false); unsigned attrib_count = glsl_count_attribute_slots(deref_instr->type, false);
unsigned idx = var->data.location; unsigned idx = var->data.location;
unsigned comp = var->data.location_frac; unsigned comp = var->data.location_frac;
unsigned const_offset = 0; unsigned const_offset = 0;
@@ -127,15 +136,19 @@ set_output_usage_mask(const nir_shader *nir, const nir_intrinsic_instr *instr,
get_deref_offset(deref_instr, &const_offset); get_deref_offset(deref_instr, &const_offset);
if (var->data.compact) { if (var->data.compact) {
assert(!glsl_type_is_64bit(deref_instr->type));
const_offset += comp; const_offset += comp;
output_usage_mask[idx + const_offset / 4] |= 1 << (const_offset % 4); output_usage_mask[idx + const_offset / 4] |= 1 << (const_offset % 4);
return; return;
} }
for (unsigned i = 0; i < attrib_count; i++) { uint32_t wrmask = nir_intrinsic_write_mask(instr);
if (glsl_type_is_64bit(deref_instr->type))
wrmask = widen_writemask(wrmask);
for (unsigned i = 0; i < attrib_count; i++)
output_usage_mask[idx + i + const_offset] |= output_usage_mask[idx + i + const_offset] |=
instr->const_index[0] << comp; ((wrmask >> (i * 4)) & 0xf) << comp;
}
} }
static void static void