summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-04-29 17:57:28 -0700
committerEric Anholt <eric@anholt.net>2010-05-03 11:40:26 -0700
commit81f49a774eec3990b0a6ffeca75119e6a3ef827d (patch)
tree20f2faf682c9b29f564b882f8aad334956e2b223
parent7f436a837c2f265cfd790ff20ac51377d7207c40 (diff)
Quiet warnings about ir_shader not being handled in places it's not needed.
-rw-r--r--glsl_parser_extras.cpp1
-rw-r--r--ir_variable.cpp5
2 files changed, 6 insertions, 0 deletions
diff --git a/glsl_parser_extras.cpp b/glsl_parser_extras.cpp
index 4255d2d..4183d13 100644
--- a/glsl_parser_extras.cpp
+++ b/glsl_parser_extras.cpp
@@ -48,6 +48,7 @@ _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/ir_variable.cpp b/ir_variable.cpp
index b5e7d6e..2c2b57a 100644
--- a/ir_variable.cpp
+++ b/ir_variable.cpp
@@ -21,6 +21,7 @@
* DEALINGS IN THE SOFTWARE.
*/
+#include <stdio.h>
#include "glsl_parser_extras.h"
#include "glsl_symbol_table.h"
#include "ir.h"
@@ -315,5 +316,9 @@ _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;
}
}