Mesa (master): glsl: Rename "expr" to "lhs_expr" in vector_extract munging code.
Kenneth Graunke
kwg at kemper.freedesktop.org
Fri Jan 24 22:19:02 UTC 2014
Module: Mesa
Branch: master
Commit: 6c158e110c0aec5371bea6fc1c14f28b045797b0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c158e110c0aec5371bea6fc1c14f28b045797b0
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Fri Jan 24 10:42:48 2014 -0800
glsl: Rename "expr" to "lhs_expr" in vector_extract munging code.
When processing assignments, we have both an LHS and RHS. At a glance,
"lhs_expr" clearly refers to the LHS, while a generic name like "expr"
is ambiguous.
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/glsl/ast_to_hir.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index c71078e..67ab09b 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -745,9 +745,9 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
* expression, move it to the RHS as an ir_triop_vector_insert.
*/
if (lhs->ir_type == ir_type_expression) {
- ir_expression *const expr = lhs->as_expression();
+ ir_expression *const lhs_expr = lhs->as_expression();
- if (unlikely(expr->operation == ir_binop_vector_extract)) {
+ if (unlikely(lhs_expr->operation == ir_binop_vector_extract)) {
ir_rvalue *new_rhs =
validate_assignment(state, lhs_loc, lhs->type,
rhs, is_initializer);
@@ -756,11 +756,11 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
return lhs;
} else {
rhs = new(ctx) ir_expression(ir_triop_vector_insert,
- expr->operands[0]->type,
- expr->operands[0],
+ lhs_expr->operands[0]->type,
+ lhs_expr->operands[0],
new_rhs,
- expr->operands[1]);
- lhs = expr->operands[0]->clone(ctx, NULL);
+ lhs_expr->operands[1]);
+ lhs = lhs_expr->operands[0]->clone(ctx, NULL);
}
}
}
More information about the mesa-commit
mailing list