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

gallium/nir/tgsi: add support for compact variables

Browse source 
vulkan tessellation uses compact variables for tess factors,
and trips over in the nir->tgsi info gathering, add support
to the info extraction for compact inputs and outputs.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6339>
This commit is contained in:
Dave Airlie 2020-08-17 14:52:04 +10:00
parent fe9667e336
commit 597d0e9b5f
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gallium/auxiliary/nir/nir_to_tgsi_info.c
View file

@ -63,10 +63,15 @@ static void gather_usage_helper(const nir_deref_instr **deref_ptr,
const nir_deref_instr *deref = *deref_ptr;
switch (deref->deref_type) {
case nir_deref_type_array: {
unsigned elem_size =
bool is_compact = nir_deref_instr_get_variable(deref)->data.compact;
unsigned elem_size = is_compact ? DIV_ROUND_UP(glsl_get_length(deref->type), 4) :
glsl_count_attribute_slots(deref->type, false);
if (nir_src_is_const(deref->arr.index)) {
location += elem_size * nir_src_as_uint(deref->arr.index);
if (is_compact) {
location += nir_src_as_uint(deref->arr.index) / 4;
mask <<= nir_src_as_uint(deref->arr.index) % 4;
} else
location += elem_size * nir_src_as_uint(deref->arr.index);
} else {
unsigned array_elems =
glsl_get_length(deref_ptr[-1]->type);
@ -498,8 +503,8 @@ void nir_tgsi_scan_shader(const struct nir_shader *nir,
type = glsl_get_array_element(type);
}
unsigned attrib_count = glsl_count_attribute_slots(type,
nir->info.stage == MESA_SHADER_VERTEX);
unsigned attrib_count = variable->data.compact ? DIV_ROUND_UP(glsl_get_length(type), 4) :
glsl_count_attribute_slots(type, nir->info.stage == MESA_SHADER_VERTEX);
i = variable->data.driver_location;
@ -584,7 +589,8 @@ void nir_tgsi_scan_shader(const struct nir_shader *nir,
type = glsl_get_array_element(type);
}
unsigned attrib_count = glsl_count_attribute_slots(type, false);
unsigned attrib_count = variable->data.compact ? DIV_ROUND_UP(glsl_get_length(type), 4) :
glsl_count_attribute_slots(type, false);
for (unsigned k = 0; k < attrib_count; k++, i++) {
if (nir->info.stage == MESA_SHADER_FRAGMENT) {