Mesa (master): glsl: Correctly handle vector extract on function parameter
Jordan Justen
jljusten at kemper.freedesktop.org
Thu Nov 12 22:17:02 UTC 2015
Module: Mesa
Branch: master
Commit: b52cb9ec6ab3b74f754ccf8472b9db2b6d8c3333
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b52cb9ec6ab3b74f754ccf8472b9db2b6d8c3333
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Wed Nov 11 22:02:06 2015 -0800
glsl: Correctly handle vector extract on function parameter
This commit accidentally used a '==' when '=' was intended.
commit 96b22fb080894ba1840af2372f28a46cc0f40c76
Author: Kristian Høgsberg Kristensen <krh at bitplanet.net>
Date: Wed Nov 4 14:58:54 2015 -0800
glsl: Use array deref for access to vector components
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>
---
src/glsl/ast_function.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 5584470..466ece6 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -368,8 +368,8 @@ fix_parameter(void *mem_ctx, ir_rvalue *actual, const glsl_type *formal_type,
ir_rvalue *lhs = actual;
if (expr != NULL && expr->operation == ir_binop_vector_extract) {
- lhs == new(mem_ctx) ir_dereference_array(expr->operands[0]->clone(mem_ctx, NULL),
- expr->operands[1]->clone(mem_ctx, NULL));
+ lhs = new(mem_ctx) ir_dereference_array(expr->operands[0]->clone(mem_ctx, NULL),
+ expr->operands[1]->clone(mem_ctx, NULL));
}
ir_assignment *const assignment_2 = new(mem_ctx) ir_assignment(lhs, rhs);
More information about the mesa-commit
mailing list