Mesa (glsl2): ast_function: Remove unnecessary check for empty constructors .

Ian Romanick idr at kemper.freedesktop.org
Fri Jul 9 17:43:17 UTC 2010


Module: Mesa
Branch: glsl2
Commit: 59df3385e1c413332c75be5d0e7751972d45430e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=59df3385e1c413332c75be5d0e7751972d45430e

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Jul  8 17:59:56 2010 -0700

ast_function: Remove unnecessary check for empty constructors.

This case is already caught by a later check that ensures sufficient
components were provided, based on the type.

---

 src/glsl/ast_function.cpp |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index b681115..c6cc3eb 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -923,15 +923,6 @@ ast_function_expression::hir(exec_list *instructions,
 
 	 bool all_parameters_are_constant = true;
 
-	 /* This handles invalid constructor calls such as 'vec4 v = vec4();'
-	  */
-	 if (this->expressions.is_empty()) {
-	    _mesa_glsl_error(& loc, state, "too few components to construct "
-			     "`%s'",
-			     constructor_type->name);
-	    return ir_call::get_error_instruction(ctx);
-	 }
-
 	 foreach_list (n, &this->expressions) {
 	    ast_node *ast = exec_node_data(ast_node, n, link);
 	    ir_rvalue *result =




More information about the mesa-commit mailing list