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

spirv: Don't replicate patch bool in vtn_variable

Browse Source 
When we originally added patch variable handling to spirv_to_nir, we
were splitting I/O block variables in spirv_to_nir, so we weren't
guaranteed to have a nir_variable early enough in processing.

Since b0c643d8f5 ("spirv: Use NIR per-member splitting"), we've been
using NIR per-member splitting where we have a nir_variable which has
a separate nir_variable_data per member.  With this, we can drop
vtn_variable::patch and use the patch boolean on the nir_variable
instead.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10469>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2021-03-03 22:49:00 -08:00
committed by Marge Bot
parent 3cd5e1b40f
commit e763db4a47
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/spirv/vtn_private.h
View File

@@ -556,7 +556,6 @@ struct vtn_variable {
bool explicit_binding; bool explicit_binding;
unsigned offset; unsigned offset;
unsigned input_attachment_index; unsigned input_attachment_index;
bool patch;
nir_variable *var; nir_variable *var;

30
src/compiler/spirv/vtn_variables.c
View File

@@ -1282,11 +1282,11 @@ apply_var_decoration(struct vtn_builder *b,
static void static void
var_is_patch_cb(struct vtn_builder *b, struct vtn_value *val, int member, var_is_patch_cb(struct vtn_builder *b, struct vtn_value *val, int member,
const struct vtn_decoration *dec, void *out_is_patch) const struct vtn_decoration *dec, void *void_var)
{ {
if (dec->decoration == SpvDecorationPatch) { struct vtn_variable *vtn_var = void_var;
*((bool *) out_is_patch) = true; if (dec->decoration == SpvDecorationPatch)
} vtn_var->var->data.patch = true;
} }
static void static void
@@ -1308,7 +1308,7 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member,
vtn_var->input_attachment_index = dec->operands[0]; vtn_var->input_attachment_index = dec->operands[0];
return; return;
case SpvDecorationPatch: case SpvDecorationPatch:
vtn_var->patch = true; vtn_var->var->data.patch = true;
break; break;
case SpvDecorationOffset: case SpvDecorationOffset:
vtn_var->offset = dec->operands[0]; vtn_var->offset = dec->operands[0];
@@ -1353,7 +1353,7 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member,
location += VERT_ATTRIB_GENERIC0; location += VERT_ATTRIB_GENERIC0;
} else if (vtn_var->mode == vtn_variable_mode_input || } else if (vtn_var->mode == vtn_variable_mode_input ||
vtn_var->mode == vtn_variable_mode_output) { vtn_var->mode == vtn_variable_mode_output) {
location += vtn_var->patch ? VARYING_SLOT_PATCH0 : VARYING_SLOT_VAR0; location += vtn_var->var->data.patch ? VARYING_SLOT_PATCH0 : VARYING_SLOT_VAR0;
} else if (vtn_var->mode == vtn_variable_mode_call_data || } else if (vtn_var->mode == vtn_variable_mode_call_data ||
vtn_var->mode == vtn_variable_mode_ray_payload) { vtn_var->mode == vtn_variable_mode_ray_payload) {
/* This location is fine as-is */ /* This location is fine as-is */
@@ -1854,6 +1854,11 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val,
case vtn_variable_mode_input: case vtn_variable_mode_input:
case vtn_variable_mode_output: { case vtn_variable_mode_output: {
var->var = rzalloc(b->shader, nir_variable);
var->var->name = ralloc_strdup(var->var, val->name);
var->var->type = vtn_type_get_nir_type(b, var->type, var->mode);
var->var->data.mode = nir_mode;
/* In order to know whether or not we're a per-vertex inout, we need /* In order to know whether or not we're a per-vertex inout, we need
* the patch qualifier. This means walking the variable decorations * the patch qualifier. This means walking the variable decorations
* early before we actually create any variables. Not a big deal. * early before we actually create any variables. Not a big deal.
@@ -1870,21 +1875,14 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val,
* it to be all or nothing, we'll call it patch if any of the members * it to be all or nothing, we'll call it patch if any of the members
* are declared patch. * are declared patch.
*/ */
var->patch = false; vtn_foreach_decoration(b, val, var_is_patch_cb, var);
vtn_foreach_decoration(b, val, var_is_patch_cb, &var->patch);
if (glsl_type_is_array(var->type->type) && if (glsl_type_is_array(var->type->type) &&
glsl_type_is_struct_or_ifc(without_array->type)) { glsl_type_is_struct_or_ifc(without_array->type)) {
vtn_foreach_decoration(b, vtn_value(b, without_array->id, vtn_foreach_decoration(b, vtn_value(b, without_array->id,
vtn_value_type_type), vtn_value_type_type),
var_is_patch_cb, &var->patch); var_is_patch_cb, var);
} }
var->var = rzalloc(b->shader, nir_variable);
var->var->name = ralloc_strdup(var->var, val->name);
var->var->type = vtn_type_get_nir_type(b, var->type, var->mode);
var->var->data.mode = nir_mode;
var->var->data.patch = var->patch;
struct vtn_type *per_vertex_type = var->type; struct vtn_type *per_vertex_type = var->type;
if (nir_is_per_vertex_io(var->var, b->shader->info.stage)) if (nir_is_per_vertex_io(var->var, b->shader->info.stage))
per_vertex_type = var->type->array_element; per_vertex_type = var->type->array_element;
@@ -1923,7 +1921,7 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val,
for (unsigned i = 0; i < var->var->num_members; i++) { for (unsigned i = 0; i < var->var->num_members; i++) {
var->var->members[i].mode = nir_mode; var->var->members[i].mode = nir_mode;
var->var->members[i].patch = var->patch; var->var->members[i].patch = var->var->data.patch;
var->var->members[i].location = -1; var->var->members[i].location = -1;
} }
} }