diff options
| author | Ian Romanick <[email protected]> | 2014-07-16 16:51:14 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2014-08-04 14:40:07 -0700 |
| commit | 814d694160da436a2b6218976b212e52478802b7 (patch) | |
| tree | f561daed5c3a30defa27b156aa0819069c8c83c6 /src/glsl/link_uniforms.cpp | |
| parent | ab7098c8dfeb0c6de508b02a34c592aa4e343dff (diff) | |
glsl: Track matrix layout of structure fields using two bits
v2: Rename GLSL_MATRIX_LAYOUT_DEFAULT to GLSL_MATRIX_LAYOUT_INHERITED.
Add comments in glsl_types.h explaining the layouts. Suggested by Matt.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/glsl/link_uniforms.cpp')
| -rw-r--r-- | src/glsl/link_uniforms.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp index cfb23effcf7..5137e3a3910 100644 --- a/src/glsl/link_uniforms.cpp +++ b/src/glsl/link_uniforms.cpp @@ -182,7 +182,8 @@ program_resource_visitor::recursion(const glsl_type *t, char **name, } recursion(t->fields.structure[i].type, name, new_length, - t->fields.structure[i].row_major, record_type, + t->fields.structure[i].matrix_layout == GLSL_MATRIX_LAYOUT_ROW_MAJOR, + record_type, (i + 1) == t->length); /* Only the first leaf-field of the record gets called with the |