diff options
| author | Timothy Arceri <t_arceri@yahoo.com.au> | 2015-04-30 20:45:54 +1000 |
|---|---|---|
| committer | Timothy Arceri <t_arceri@yahoo.com.au> | 2015-05-22 08:35:45 +1000 |
| commit | d67515b7be1ebd9482970ac1867ee4e9bbbf96d5 (patch) | |
| tree | 6c89e134e067cbf9a56b7ef92b5734fbb4e3385c /src/glsl/link_varyings.cpp | |
| parent | 51ccdb63467b1e848db025670f126eccb051f8f2 (diff) | |
| download | external_mesa3d-d67515b7be1ebd9482970ac1867ee4e9bbbf96d5.zip external_mesa3d-d67515b7be1ebd9482970ac1867ee4e9bbbf96d5.tar.gz external_mesa3d-d67515b7be1ebd9482970ac1867ee4e9bbbf96d5.tar.bz2 | |
glsl: remove element_type() helper
We now have is_array() and without_array() that make the
code much clearer and remove the need for this.
For all remaining calls to this we already knew that
the type was an array so returning a null wasn't adding any value.
v2: use without_array() in _mesa_ast_array_index_to_hir() and don't use
without_array() in lower_clip_distance_visitor() as we want to make sure the
array is 2D.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/glsl/link_varyings.cpp')
| -rw-r--r-- | src/glsl/link_varyings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp index 605748a..7b2d4bd 100644 --- a/src/glsl/link_varyings.cpp +++ b/src/glsl/link_varyings.cpp @@ -56,7 +56,7 @@ cross_validate_types_and_qualifiers(struct gl_shader_program *prog, const glsl_type *type_to_match = input->type; if (consumer_stage == MESA_SHADER_GEOMETRY) { assert(type_to_match->is_array()); /* Enforced by ast_to_hir */ - type_to_match = type_to_match->element_type(); + type_to_match = type_to_match->fields.array; } if (type_to_match != output->type) { /* There is a bit of a special case for gl_TexCoord. This |