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

Replace remaining uses of is_numeric_base_type with glsl_type::is_numeric

Browse Source
This commit is contained in:
Ian Romanick
2010-03-26 14:40:37 -07:00
parent 40176e249f
commit a6d653dcbb
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ast_to_hir.cpp
View File

@@ -239,7 +239,7 @@ unary_arithmetic_result_type(const struct glsl_type *type)
* component-wise on their operands. These result with the same type * component-wise on their operands. These result with the same type
* they operated on." * they operated on."
*/ */
if (!is_numeric_base_type(type->base_type)) if (!type->is_numeric())
return glsl_type::error_type; return glsl_type::error_type;
return type; return type;
@@ -289,8 +289,8 @@ relational_result_type(const struct glsl_type *type_a,
* than or equal (>=), and less than or equal (<=) operate only on * than or equal (>=), and less than or equal (<=) operate only on
* scalar integer and scalar floating-point expressions." * scalar integer and scalar floating-point expressions."
*/ */
if (! is_numeric_base_type(type_a->base_type) if (!type_a->is_numeric()
|| ! is_numeric_base_type(type_b->base_type) || !type_b->is_numeric()
|| !type_a->is_scalar() || !type_a->is_scalar()
|| !type_b->is_scalar()) || !type_b->is_scalar())
return glsl_type::error_type; return glsl_type::error_type;

3
glsl_types.h
View File

@@ -39,9 +39,6 @@
#define GLSL_TYPE_VOID 8 #define GLSL_TYPE_VOID 8
#define GLSL_TYPE_ERROR 9 #define GLSL_TYPE_ERROR 9
#define is_numeric_base_type(b) \
(((b) >= GLSL_TYPE_UINT) && ((b) <= GLSL_TYPE_FLOAT))
#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 {