diff options
author | Timothy Arceri <[email protected]> | 2014-08-18 21:40:50 -1000 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2015-04-27 21:30:54 +1000 |
commit | fda5f7bb2f23b4adb2f2684162dfb36fe0cb8641 (patch) | |
tree | 4c795748810833a1bb00b232d6f14bf7afaabbe9 /src/glsl | |
parent | 9ea38ee96d483a1bc5b525f5452216f454f450ab (diff) |
glsl: add arrays of arrays support to without_array function
Signed-off-by: Timothy Arceri <[email protected]>
Reviewed-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r-- | src/glsl/glsl_types.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index d383dd5bef1..5645dcd5011 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -540,7 +540,12 @@ struct glsl_type { */ const glsl_type *without_array() const { - return this->is_array() ? this->fields.array : this; + const glsl_type *t = this; + + while (t->is_array()) + t = t->fields.array; + + return t; } /** |