glsl: Remove GLSL_TYPE_FUNCTION define.

Functions are not first class objects in GLSL, so there is never a value
of function type.  No code actually used this except for one function
which asserted it shouldn't occur.  One comment mentioned it, but was
incorrect.  So we may as well remove it entirely.

diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h
index dccab0a60d349b047dd97e18620d2287ab8b1b2e..d38ef0b88b226bdac5ee2d35e9522a55df07e8a4 100644 (file)
--- a/src/glsl/glsl_types.h
+++ b/src/glsl/glsl_types.h
@@ -50,9 +50,8 @@ _mesa_glsl_release_types(void);
 #define GLSL_TYPE_SAMPLER       4
 #define GLSL_TYPE_STRUCT        5
 #define GLSL_TYPE_ARRAY         6
-#define GLSL_TYPE_FUNCTION      7
-#define GLSL_TYPE_VOID          8
-#define GLSL_TYPE_ERROR         9
+#define GLSL_TYPE_VOID          7
+#define GLSL_TYPE_ERROR         8
 
 enum glsl_sampler_dim {
    GLSL_SAMPLER_DIM_1D = 0,
@@ -123,11 +122,6 @@ struct glsl_type {
     * For \c GLSL_TYPE_ARRAY, this is the length of the array.  For
     * \c GLSL_TYPE_STRUCT, it is the number of elements in the structure and
     * the number of values pointed to by \c fields.structure (below).
-    *
-    * For \c GLSL_TYPE_FUNCTION, it is the number of parameters to the
-    * function.  The return value from a function is implicitly the first
-    * parameter.  The types of the parameters are stored in
-    * \c fields.parameters (below).
     */
    unsigned length;
 

diff --git a/src/glsl/ir_function.cpp b/src/glsl/ir_function.cpp
index dfdec144b2feb3ace2740ac8975fe0dc2b900ee4..8db70119ec21c0f94c7e2a3d3642044446be65b6 100644 (file)
--- a/src/glsl/ir_function.cpp
+++ b/src/glsl/ir_function.cpp
@@ -70,7 +70,6 @@ type_compare(const glsl_type *a, const glsl_type *b)
        */
       return (type_compare(a->fields.array, b->fields.array) == 0) ? 0 : -1;
 
-   case GLSL_TYPE_FUNCTION:
    case GLSL_TYPE_VOID:
    case GLSL_TYPE_ERROR:
    default: