summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/glsl/ast_to_hir.cpp6
-rw-r--r--src/glsl/glsl_parser_extras.cpp1
-rw-r--r--src/glsl/glsl_parser_extras.h3
-rw-r--r--src/glsl/ir_variable.cpp4
4 files changed, 2 insertions, 12 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index af301e535ee..15e1afc4dd2 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -1785,11 +1785,7 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
string = "output";
}
break;
-
- case ir_shader:
- assert(!"Should not get here.");
- break;
- }
+ };
if (fail) {
_mesa_glsl_error(loc, state,
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index 3b9877ec0e5..b2c378dd858 100644
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -88,7 +88,6 @@ _mesa_glsl_shader_target_name(enum _mesa_glsl_parser_targets target)
case vertex_shader: return "vertex";
case fragment_shader: return "fragment";
case geometry_shader: return "geometry";
- case ir_shader: break;
}
assert(!"Should not get here.");
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index 1f039e9f1b2..98c4e70173d 100644
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -37,8 +37,7 @@
enum _mesa_glsl_parser_targets {
vertex_shader,
geometry_shader,
- fragment_shader,
- ir_shader
+ fragment_shader
};
struct gl_context;
diff --git a/src/glsl/ir_variable.cpp b/src/glsl/ir_variable.cpp
index f2c900f718f..6b9b29458d0 100644
--- a/src/glsl/ir_variable.cpp
+++ b/src/glsl/ir_variable.cpp
@@ -504,9 +504,5 @@ _mesa_glsl_initialize_variables(exec_list *instructions,
case fragment_shader:
initialize_fs_variables(instructions, state);
break;
- case ir_shader:
- fprintf(stderr, "ir reader has no builtin variables");
- exit(1);
- break;
}
}