From 83e9eb81be05d018cf04bfada0f4005145c9f7b8 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 24 Jan 2014 10:42:48 -0800 Subject: 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@lists.freedesktop.org Reviewed-by: Ian Romanick Reviewed-by: Matt Turner Signed-off-by: Kenneth Graunke (cherry picked from commit 6c158e110c0aec5371bea6fc1c14f28b045797b0) --- src/glsl/ast_to_hir.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 48c621fe8a8..a81a0518b27 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -739,9 +739,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); @@ -750,11 +750,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); } } } -- cgit v1.2.3