Ensure that 'in' and 'inout' formal parameters are valid lvalues

This causes the following tests to pass:

    glslparsertest/shaders/function10.frag
This commit is contained in:
Ian Romanick
2010-04-02 15:51:02 -07:00
parent cf37c9e8da
commit c35bb00130
2 changed files with 31 additions and 3 deletions

View File

@@ -63,6 +63,37 @@ process_call(exec_list *instructions, ir_function *f,
(void) instructions; (void) instructions;
if (sig != NULL) { if (sig != NULL) {
/* Verify that 'out' and 'inout' actual parameters are lvalues. This
* isn't done in ir_function::matching_signature because that function
* cannot generate the necessary diagnostics.
*/
exec_list_iterator actual_iter = actual_parameters->iterator();
exec_list_iterator formal_iter = sig->parameters.iterator();
while (actual_iter.has_next()) {
ir_rvalue *actual =
((ir_instruction *) actual_iter.get())->as_rvalue();
ir_variable *formal =
((ir_instruction *) formal_iter.get())->as_variable();
assert(actual != NULL);
assert(formal != NULL);
if ((formal->mode == ir_var_out)
|| (formal->mode == ir_var_inout)) {
if (! actual->is_lvalue()) {
/* FINISHME: Log a better diagnostic here. There is no way
* FINISHME: to tell the user which parameter is invalid.
*/
_mesa_glsl_error(loc, state, "`%s' parameter is not lvalue",
(formal->mode == ir_var_out) ? "out" : "inout");
}
}
actual_iter.next();
formal_iter.next();
}
/* FINISHME: The list of actual parameters needs to be modified to /* FINISHME: The list of actual parameters needs to be modified to
* FINISHME: include any necessary conversions. * FINISHME: include any necessary conversions.
*/ */

View File

@@ -126,13 +126,10 @@ parameter_lists_match(exec_list *list_a, exec_list *list_b)
break; break;
case ir_var_out: case ir_var_out:
/* FINISHME: Make sure that actual is a valid lvalue. */
score = type_compare(actual->type, param->type); score = type_compare(actual->type, param->type);
break; break;
case ir_var_inout: case ir_var_inout:
/* FINISHME: Make sure that actual is a valid lvalue. */
/* Since there are no bi-directional automatic conversions (e.g., /* Since there are no bi-directional automatic conversions (e.g.,
* there is int -> float but no float -> int), inout parameters must * there is int -> float but no float -> int), inout parameters must
* be exact matches. * be exact matches.