summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ast_to_hir.cpp2
-rw-r--r--glsl_types.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp
index a41bae6893..2d7c92625e 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 64c6cef669..beaaa78f55 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,