glsl: Restrict functions to not return arrays or SOAs in GLSL 1.00.

From the spec,

    Arrays are allowed as arguments, but not as the return type. [...] The
    return type can also be a structure if the structure does not contain
    an array.

Fixes DEQP shaders.functions.invalid.return_array_in_struct_fragment.

v2: Spec cite wording change

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Tested-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Eric Anholt
2017-05-01 16:00:47 -07:00
parent ae7aa8dbaf
commit efa9750e96
3 changed files with 31 additions and 0 deletions

View File

@@ -5825,6 +5825,18 @@ ast_function::hir(exec_list *instructions,
"sized", name);
}
/* From Section 6.1 (Function Definitions) of the GLSL 1.00 spec:
*
* "Arrays are allowed as arguments, but not as the return type. [...]
* The return type can also be a structure if the structure does not
* contain an array."
*/
if (state->language_version == 100 && return_type->contains_array()) {
YYLTYPE loc = this->get_location();
_mesa_glsl_error(& loc, state,
"function `%s' return type contains an array", name);
}
/* From section 4.1.7 of the GLSL 4.40 spec:
*
* "[Opaque types] can only be declared as function parameters

View File

@@ -220,6 +220,19 @@ glsl_type::contains_sampler() const
}
}
bool
glsl_type::contains_array() const
{
if (this->is_record() || this->is_interface()) {
for (unsigned int i = 0; i < this->length; i++) {
if (this->fields.structure[i].type->contains_array())
return true;
}
return false;
} else {
return this->is_array();
}
}
bool
glsl_type::contains_integer() const

View File

@@ -562,6 +562,12 @@ struct glsl_type {
*/
bool contains_sampler() const;
/**
* Query whether or not type is an array or for struct, interface and
* array types, contains an array.
*/
bool contains_array() const;
/**
* Get the Mesa texture target index for a sampler type.
*/