Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / glsl / ir_function.cpp

diff --git a/src/glsl/ir_function.cpp b/src/glsl/ir_function.cpp
index 0a97e014244501815916b19f3cbaeb4ccab82f3e..caee9296af9e5c042a9aa8df80ee2de6bd5b6726 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:
@@ -124,6 +123,7 @@ parameter_lists_match(const exec_list *list_a, const exec_list *list_b)
         assert(0);
         return -1;
 
+      case ir_var_const_in:
       case ir_var_in:
         score = type_compare(param->type, actual->type);
         break;
@@ -139,6 +139,9 @@ parameter_lists_match(const exec_list *list_a, const exec_list *list_b)
          */
         score = (type_compare(actual->type, param->type) == 0) ? 0 : -1;
         break;
+
+      default:
+        assert(false);
       }
 
       if (score < 0)