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

Replace is_integer_base_type macro with glsl_type::is_integer method

Browse Source
This commit is contained in:
Ian Romanick
2010-03-26 14:38:37 -07:00
parent 0471e8b089
commit 40176e249f
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ast_to_hir.cpp
View File

@@ -255,8 +255,7 @@ modulus_result_type(const struct glsl_type *type_a,
* integer vectors. The operand types must both be signed or both be * integer vectors. The operand types must both be signed or both be
* unsigned." * unsigned."
*/ */
if (! is_integer_base_type(type_a->base_type) if (!type_a->is_integer() || !type_b->is_integer()
|| ! is_integer_base_type(type_b->base_type)
|| (type_a->base_type != type_b->base_type)) { || (type_a->base_type != type_b->base_type)) {
return glsl_type::error_type; return glsl_type::error_type;
} }

11
glsl_types.h
View File

@@ -42,9 +42,6 @@
#define is_numeric_base_type(b) \ #define is_numeric_base_type(b) \
(((b) >= GLSL_TYPE_UINT) && ((b) <= GLSL_TYPE_FLOAT)) (((b) >= GLSL_TYPE_UINT) && ((b) <= GLSL_TYPE_FLOAT))
#define is_integer_base_type(b) \
(((b) == GLSL_TYPE_UINT) || ((b) == GLSL_TYPE_INT))
#define is_error_type(t) ((t)->base_type == GLSL_TYPE_ERROR) #define is_error_type(t) ((t)->base_type == GLSL_TYPE_ERROR)
enum glsl_sampler_dim { enum glsl_sampler_dim {
@@ -203,6 +200,14 @@ struct glsl_type {
return (base_type >= GLSL_TYPE_UINT) && (base_type <= GLSL_TYPE_FLOAT); return (base_type >= GLSL_TYPE_UINT) && (base_type <= GLSL_TYPE_FLOAT);
} }
/**
* Query whether or not a type is an integral type
*/
bool is_integer() const
{
return (base_type == GLSL_TYPE_UINT) || (base_type == GLSL_TYPE_INT);
}
/** /**
* Query whether or not a type is a non-array boolean type * Query whether or not a type is a non-array boolean type
*/ */