From: Ian Romanick Date: Fri, 26 Mar 2010 21:41:32 +0000 (-0700) Subject: Replace remaining use of is_error_type with glsl_type::is_error X-Git-Tag: 062012170305~10660^2~625^2~567 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cef3baecf636a30b62cd7a1e8de57c7650f7003e;p=profile%2Fivi%2Fmesa.git Replace remaining use of is_error_type with glsl_type::is_error --- diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp index a41bae6..2d7c926 100644 --- a/ast_to_hir.cpp +++ b/ast_to_hir.cpp @@ -717,7 +717,7 @@ ast_expression::hir(exec_list *instructions, } } - if (is_error_type(type) && !error_emitted) + if (type->is_error() && !error_emitted) _mesa_glsl_error(& loc, state, "type mismatch"); return result; diff --git a/glsl_types.h b/glsl_types.h index 64c6cef..beaaa78 100644 --- a/glsl_types.h +++ b/glsl_types.h @@ -39,8 +39,6 @@ #define GLSL_TYPE_VOID 8 #define GLSL_TYPE_ERROR 9 -#define is_error_type(t) ((t)->base_type == GLSL_TYPE_ERROR) - enum glsl_sampler_dim { GLSL_SAMPLER_DIM_1D = 0, GLSL_SAMPLER_DIM_2D,