fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-31 18:30:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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
Show stats 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
* unsigned."
*/
if (! is_integer_base_type(type_a->base_type)
|| ! is_integer_base_type(type_b->base_type)
if (!type_a->is_integer() || !type_b->is_integer()
|| (type_a->base_type != type_b->base_type)) {
return glsl_type::error_type;
}

11
glsl_types.h
View file

@ -42,9 +42,6 @@
#define is_numeric_base_type(b) \
(((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)
enum glsl_sampler_dim {
@ -203,6 +200,14 @@ struct glsl_type {
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
*/