fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 20:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

glsl: Minor clean-up in validate_assignment

Browse source 
This code has been changed around a lot, and there were some temporary
variables left around from previous versions.
This commit is contained in:
Ian Romanick 2010-12-10 15:47:11 -08:00
parent 783e7caadf
commit ec53010c4d
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/glsl/ast_to_hir.cpp
View file

@ -598,17 +598,15 @@ ir_rvalue *
validate_assignment(struct _mesa_glsl_parse_state *state,
const glsl_type *lhs_type, ir_rvalue *rhs)
{
const glsl_type *rhs_type = rhs->type;
/* If there is already some error in the RHS, just return it. Anything
* else will lead to an avalanche of error message back to the user.
*/
if (rhs_type->is_error())
if (rhs->type->is_error())
return rhs;
/* If the types are identical, the assignment can trivially proceed.
*/
if (rhs_type == lhs_type)
if (rhs->type == lhs_type)
return rhs;
/* If the array element types are the same and the size of the LHS is zero,
@ -625,8 +623,7 @@ validate_assignment(struct _mesa_glsl_parse_state *state,
/* Check for implicit conversion in GLSL 1.20 */
if (apply_implicit_conversion(lhs_type, rhs, state)) {
rhs_type = rhs->type;
if (rhs_type == lhs_type)
if (rhs->type == lhs_type)
return rhs;
}