fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 07:18:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: Clarify error message about whole-array assignment in GLSL 1.10.

Browse source 
Previously, it would produce:

    Failed to compile FS: 0:6(7): error: non-lvalue in assignment

and now it produces:

    Failed to compile FS: 0:5(7): error: whole array assignment is not
    allowed in GLSL 1.10 or GLSL ES 1.00.

Also, add spec quotation to the two places we have code for array
lvalues in GLSL 1.10.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Eric Anholt 2011-09-07 12:03:36 -07:00
parent 407a1001ae
commit 525cec98a5
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/glsl/ast_to_hir.cpp
View file

@ -679,16 +679,20 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
lhs->variable_referenced()->name);
error_emitted = true;
} else if (state->language_version <= 110 && lhs->type->is_array()) {
/* From page 32 (page 38 of the PDF) of the GLSL 1.10 spec:
*
* "Other binary or unary expressions, non-dereferenced
* arrays, function names, swizzles with repeated fields,
* and constants cannot be l-values."
*/
_mesa_glsl_error(&lhs_loc, state, "whole array assignment is not "
"allowed in GLSL 1.10 or GLSL ES 1.00.");
error_emitted = true;
} else if (!lhs->is_lvalue()) {
_mesa_glsl_error(& lhs_loc, state, "non-lvalue in assignment");
error_emitted = true;
}
if (state->es_shader && lhs->type->is_array()) {
_mesa_glsl_error(&lhs_loc, state, "whole array assignment is not "
"allowed in GLSL ES 1.00.");
error_emitted = true;
}
}
ir_rvalue *new_rhs =
@ -2117,6 +2121,21 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
else
var->depth_layout = ir_depth_layout_none;
/* From page 46 (page 52 of the PDF) of the GLSL ES specification:
*
* "Array variables are l-values and may be passed to parameters
* declared as out or inout. However, they may not be used as
* the target of an assignment."
*
* From page 32 (page 38 of the PDF) of the GLSL 1.10 spec:
*
* "Other binary or unary expressions, non-dereferenced arrays,
* function names, swizzles with repeated fields, and constants
* cannot be l-values."
*
* So we only mark 1.10 as non-lvalues, and check for array
* assignment in 100 specifically in do_assignment.
*/
if (var->type->is_array() && state->language_version != 110) {
var->array_lvalue = true;
}