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

compiler/types: Add glsl_type_compare_no_precision() and use it in C++

Browse source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25129>
This commit is contained in:
Caio Oliveira 2023-09-07 20:03:57 -07:00 • committed by Marge Bot
parent 3ce4d5e033
commit e98ba3b53f
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/compiler/glsl_types.cpp
View file

@ -1348,35 +1348,35 @@ glsl_cmat_type(const struct glsl_cmat_description *desc)
return t;
}
bool
glsl_type::compare_no_precision(const struct glsl_type *b) const
extern "C" bool
glsl_type_compare_no_precision(const struct glsl_type *a, const struct glsl_type *b)
{
if (this == b)
if (a == b)
return true;
if (this->is_array()) {
if (!b->is_array() || this->length != b->length)
if (a->is_array()) {
if (!b->is_array() || a->length != b->length)
return false;
const struct glsl_type *b_no_array = b->fields.array;
return this->fields.array->compare_no_precision(b_no_array);
return a->fields.array->compare_no_precision(b_no_array);
}
if (this->is_struct()) {
if (a->is_struct()) {
if (!b->is_struct())
return false;
} else if (this->is_interface()) {
} else if (a->is_interface()) {
if (!b->is_interface())
return false;
} else {
return false;
}
return record_compare(b,
true, /* match_name */
true, /* match_locations */
false /* match_precision */);
return glsl_record_compare(a, b,
true, /* match_name */
true, /* match_locations */
false /* match_precision */);
}
extern "C" bool

1
src/compiler/glsl_types.h
View file

@ -1346,6 +1346,7 @@ glsl_get_sampler_result_type(const struct glsl_type *t)
int glsl_get_sampler_coordinate_components(const struct glsl_type *t);
bool glsl_type_compare_no_precision(const struct glsl_type *a, const struct glsl_type *b);
bool glsl_record_compare(const struct glsl_type *a, const struct glsl_type *b,
bool match_name, bool match_locations,
bool match_precision);

1
src/compiler/glsl_types_impl.h
View file

@ -57,6 +57,7 @@ inline int glsl_type::field_index(const char *n) const { return glsl_get_field_i
inline enum glsl_interface_packing glsl_type::get_interface_packing() const { return glsl_get_ifc_packing(this); }
inline enum glsl_interface_packing glsl_type::get_internal_ifc_packing(bool std430_supported) const { return glsl_get_internal_ifc_packing(this, std430_supported); }
inline bool glsl_type::compare_no_precision(const glsl_type *b) const { return glsl_type_compare_no_precision(this, b); }
inline bool glsl_type::record_compare(const glsl_type *b, bool match_name, bool match_locations, bool match_precision) const { return glsl_record_compare(this, b, match_name, match_locations, match_precision); }
inline unsigned glsl_type::components() const { return glsl_get_components(this); }