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 a41bae6893392ed3029381861297d4b6fc1a30e4..2d7c92625e32e07a64cd87d40b981dbd0cd881ef 100644 (file)
--- 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 64c6cef669ef6fad36390d7e5c5adf20cde996ee..beaaa78f5538a9b5d9609b24355f11609457c975 100644 (file)
--- 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,