Replace remaining use of is_error_type with glsl_type::is_error

2010-03-26 14:41:32 -07:00
parent a6d653dcbb
commit cef3baecf6
2 changed files with 1 additions and 3 deletions
--- 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;
--- 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,