[Mesa-dev] [PATCH 03/14] glsl: Fix inverted conditional in error message.
Matt Turner
mattst88 at gmail.com
Sat Jun 29 19:43:53 PDT 2013
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.
---
src/glsl/ast_function.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 0860238..4b0b873 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);
}
--
1.8.1.5
More information about the mesa-dev
mailing list