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

glsl: add AoA support for linking interface blocks with unsized members

Browse Source 
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Timothy Arceri
2015-03-12 19:52:47 +11:00
parent dd89880dc0
commit d1d05c0f85
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/glsl/ir.cpp
View File

@@ -1689,8 +1689,8 @@ ir_variable::ir_variable(const struct glsl_type *type, const char *name,
if (type->is_interface())
this->init_interface_type(type);
else if (type->is_array() && type->fields.array->is_interface())
this->init_interface_type(type->fields.array);
else if (type->without_array()->is_interface())
this->init_interface_type(type->without_array());
}
}

9
src/glsl/linker.cpp
View File

@@ -1387,8 +1387,10 @@ public:
virtual ir_visitor_status visit(ir_variable *var)
{
const glsl_type *type_without_array;
fixup_type(&var->type, var->data.max_array_access,
var->data.from_ssbo_unsized_array);
type_without_array = var->type->without_array();
if (var->type->is_interface()) {
if (interface_contains_unsized_arrays(var->type)) {
const glsl_type *new_type =
@@ -1398,11 +1400,10 @@ public:
var->type = new_type;
var->change_interface_type(new_type);
}
} else if (var->type->is_array() &&
var->type->fields.array->is_interface()) {
if (interface_contains_unsized_arrays(var->type->fields.array)) {
} else if (type_without_array->is_interface()) {
if (interface_contains_unsized_arrays(type_without_array)) {
const glsl_type *new_type =
resize_interface_members(var->type->fields.array,
resize_interface_members(type_without_array,
var->get_max_ifc_array_access(),
var->is_in_shader_storage_block());
var->change_interface_type(new_type);