diff options
author | Paul Berry <[email protected]> | 2014-01-21 15:41:26 -0800 |
---|---|---|
committer | Paul Berry <[email protected]> | 2014-01-22 11:08:30 -0800 |
commit | 0da1a2cc369052643ccaea75a1722cc37652d82a (patch) | |
tree | e85839b80332c2280671c376d16719ec43a1c823 /src/glsl/link_functions.cpp | |
parent | 6ec210989fa10847091f06fcfcab77dd07618dff (diff) |
glsl: Simplify aggregate type inference to prepare for ARB_arrays_of_arrays.
Most of the time it is not necessary to perform type inference to
compile GLSL; the type of every expression can be inferred from the
contents of the expression itself (and previous type declarations).
The exception is aggregate initializers: their type is determined by
the LHS of the variable being assigned to. For example, in the
statement:
mat2 foo = { { 1, 2 }, { 3, 4 } };
the type of { 1, 2 } is only known to be vec2 (as opposed to, say,
ivec2, uvec2, int[2], or a struct) because of the fact that the result
is being assigned to a mat2.
Previous to this patch, we handled this situation by doing some type
inference during parsing: when parsing a declaration like the one
above, we would call _mesa_set_aggregate_type(), which would infer the
type of each aggregate initializer and store it in the corresponding
ast_aggregate_initializer::constructor_type field. Since this
happened at parse time, we couldn't do the type inference using
glsl_type objects; we had to use ast_type_specifiers, which are much
more awkward to work with. Things are about to get more complicated
when we add support for ARB_arrays_of_arrays.
This patch simplifies things by postponing the call to
_mesa_set_aggregate_type() until ast-to-hir time, when we have access
to glsl_type objects. As a side benefit, we only need to have one
call to _mesa_set_aggregate_type() now, instead of six.
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/glsl/link_functions.cpp')
0 files changed, 0 insertions, 0 deletions