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

glsl: rename get_record_instance() -> get_struct_instance()

Browse Source 
Replace done using:
find ./src -type f -exec sed -i -- \
's/get_record_instance(/get_struct_instance(/g' {} \;

Acked-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Timothy Arceri
2019-03-05 15:46:14 +11:00
parent 81ee2cd8ba
commit 88d8c4e290
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/ast_to_hir.cpp
View File

@@ -7581,7 +7581,7 @@ ast_struct_specifier::hir(exec_list *instructions,
validate_identifier(this->name, loc, state); validate_identifier(this->name, loc, state);
type = glsl_type::get_record_instance(fields, decl_count, this->name); type = glsl_type::get_struct_instance(fields, decl_count, this->name);
if (!type->is_anonymous() && !state->symbols->add_type(name, type)) { if (!type->is_anonymous() && !state->symbols->add_type(name, type)) {
const glsl_type *match = state->symbols->get_type(name); const glsl_type *match = state->symbols->get_type(name);

2
src/compiler/glsl/tests/array_refcount_test.cpp
View File

@@ -477,7 +477,7 @@ TEST_F(array_refcount_test, do_not_process_array_inside_structure)
}; };
const glsl_type *const record_of_array_3_of_int = const glsl_type *const record_of_array_3_of_int =
glsl_type::get_record_instance(fields, ARRAY_SIZE(fields), "S"); glsl_type::get_struct_instance(fields, ARRAY_SIZE(fields), "S");
ir_variable *var_a = new(mem_ctx) ir_variable(glsl_type::int_type, ir_variable *var_a = new(mem_ctx) ir_variable(glsl_type::int_type,
"a", "a",

6
src/compiler/glsl_types.cpp
View File

@@ -434,7 +434,7 @@ const glsl_type *glsl_type::get_bare_type() const
bare_fields[i].name = this->fields.structure[i].name; bare_fields[i].name = this->fields.structure[i].name;
} }
const glsl_type *bare_type = const glsl_type *bare_type =
get_record_instance(bare_fields, this->length, this->name); get_struct_instance(bare_fields, this->length, this->name);
delete[] bare_fields; delete[] bare_fields;
return bare_type; return bare_type;
} }
@@ -1127,7 +1127,7 @@ glsl_type::record_key_hash(const void *a)
const glsl_type * const glsl_type *
glsl_type::get_record_instance(const glsl_struct_field *fields, glsl_type::get_struct_instance(const glsl_struct_field *fields,
unsigned num_fields, unsigned num_fields,
const char *name) const char *name)
{ {
@@ -2375,7 +2375,7 @@ decode_type_from_blob(struct blob_reader *blob)
t = glsl_type::get_interface_instance(fields, num_fields, packing, t = glsl_type::get_interface_instance(fields, num_fields, packing,
row_major, name); row_major, name);
} else { } else {
t = glsl_type::get_record_instance(fields, num_fields, name); t = glsl_type::get_struct_instance(fields, num_fields, name);
} }
free(fields); free(fields);

2
src/compiler/glsl_types.h
View File

@@ -312,7 +312,7 @@ public:
/** /**
* Get the instance of a record type * Get the instance of a record type
*/ */
static const glsl_type *get_record_instance(const glsl_struct_field *fields, static const glsl_type *get_struct_instance(const glsl_struct_field *fields,
unsigned num_fields, unsigned num_fields,
const char *name); const char *name);

2
src/compiler/nir_types.cpp
View File

@@ -486,7 +486,7 @@ const glsl_type *
glsl_struct_type(const glsl_struct_field *fields, glsl_struct_type(const glsl_struct_field *fields,
unsigned num_fields, const char *name) unsigned num_fields, const char *name)
{ {
return glsl_type::get_record_instance(fields, num_fields, name); return glsl_type::get_struct_instance(fields, num_fields, name);
} }
const glsl_type * const glsl_type *