KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl/ast: Verify that function calls don't discard image format qualifiers. 

Reviewed-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Francisco Jerez 2013-11-22 15:11:50 -08:00
parent 94a95e03d9
commit 81c167ef1c
1 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/glsl/ast_function.cpp
View File

@ -93,6 +93,57 @@ prototype_string(const glsl_type *return_type, const char *name,
return str;
}
static bool
verify_image_parameter(YYLTYPE *loc, _mesa_glsl_parse_state *state,
const ir_variable *formal, const ir_variable *actual)
{
/**
* From the ARB_shader_image_load_store specification:
*
* "The values of image variables qualified with coherent,
* volatile, restrict, readonly, or writeonly may not be passed
* to functions whose formal parameters lack such
* qualifiers. [...] It is legal to have additional qualifiers
* on a formal parameter, but not to have fewer."
*/
if (actual->data.image.coherent && !formal->data.image.coherent) {
_mesa_glsl_error(loc, state,
"function call parameter `%s' drops "
"`coherent' qualifier", formal->name);
return false;
}
if (actual->data.image._volatile && !formal->data.image._volatile) {
_mesa_glsl_error(loc, state,
"function call parameter `%s' drops "
"`volatile' qualifier", formal->name);
return false;
}
if (actual->data.image._restrict && !formal->data.image._restrict) {
_mesa_glsl_error(loc, state,
"function call parameter `%s' drops "
"`restrict' qualifier", formal->name);
return false;
}
if (actual->data.image.read_only && !formal->data.image.read_only) {
_mesa_glsl_error(loc, state,
"function call parameter `%s' drops "
"`readonly' qualifier", formal->name);
return false;
}
if (actual->data.image.write_only && !formal->data.image.write_only) {
_mesa_glsl_error(loc, state,
"function call parameter `%s' drops "
"`writeonly' qualifier", formal->name);
return false;
}
return true;
}
/**
* Verify that 'out' and 'inout' actual parameters are lvalues. Also, verify
* that 'const_in' formal parameters (an extension in our IR) correspond to
@ -180,6 +231,13 @@ verify_parameter_modes(_mesa_glsl_parse_state *state,
}
}
if (formal->type->is_image() &&
actual->variable_referenced()) {
if (!verify_image_parameter(&loc, state, formal,
actual->variable_referenced()))
return false;
}
actual_ir_node = actual_ir_node->next;
actual_ast_node = actual_ast_node->next;
}