From: Matt Turner <mattst88@gmail.com>
Date: Mon, 10 Jun 2013 20:28:40 +0000 (-0700)
Subject: glsl: Fix inverted conditional in error message.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=46b74ca7bc06ce092136cd313fd963e82be06b00;p=mesa.git

glsl: Fix inverted conditional in error message.

The code float a[2] = float[2]( 3.4, 4.2, 5.0 ); previously generated
this:

   error: array constructor must have at least 2 parameters

when in fact it requires exactly two.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Ian Romanick <ian.d.romainck@intel.com>
---

diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 08602385434..4b0b87351f5 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -648,7 +648,7 @@ process_array_constructor(exec_list *instructions,
 
       _mesa_glsl_error(loc, state, "array constructor must have %s %u "
 		       "parameter%s",
-		       (constructor_type->length != 0) ? "at least" : "exactly",
+		       (constructor_type->length == 0) ? "at least" : "exactly",
 		       min_param, (min_param <= 1) ? "" : "s");
       return ir_rvalue::error_value(ctx);
    }