Mesa (master): glsl: Remove useless ir_shader enumeration value.

Kenneth Graunke kwg at kemper.freedesktop.org
Wed Oct 20 22:08:48 UTC 2010


Module: Mesa
Branch: master
Commit: a75da2c0e85eb6b8279ec895c3f74cc4aefc0257
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a75da2c0e85eb6b8279ec895c3f74cc4aefc0257

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Wed Oct 20 14:59:40 2010 -0700

glsl: Remove useless ir_shader enumeration value.

---

 src/glsl/ast_to_hir.cpp         |    6 +-----
 src/glsl/glsl_parser_extras.cpp |    1 -
 src/glsl/glsl_parser_extras.h   |    3 +--
 src/glsl/ir_variable.cpp        |    4 ----
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index af301e5..15e1afc 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 3b9877e..b2c378d 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 1f039e9..98c4e70 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 f2c900f..6b9b294 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;
    }
 }




More information about the mesa-commit mailing list