From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 11 Jun 2010 18:36:12 +0000 (-0700)
Subject: Remove redundant type checks for constant constructors
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2cf0969de5e50f5e3673d5a400bedc26b2d746d6;p=mesa.git

Remove redundant type checks for constant constructors

All of the cases (e.g., arrays and structures) that were being
filtered by these tests were already filtered by the earlier
is_numeric and is_boolean tests.
---

diff --git a/ast_function.cpp b/ast_function.cpp
index b0700bed5f9..aba43749e06 100644
--- a/ast_function.cpp
+++ b/ast_function.cpp
@@ -548,9 +548,6 @@ ast_function_expression::hir(exec_list *instructions,
 	     * constant representing the complete collection of parameters.
 	     */
 	    if (all_parameters_are_constant
-		&& (sig->return_type->is_scalar()
-		    || sig->return_type->is_vector()
-		    || sig->return_type->is_matrix())
 		&& (components_used >= type_components))
 	       return new ir_constant(sig->return_type, & actual_parameters);
 	    else