glsl: use explicit offset when lowering buffer access

Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2016-01-08 22:49:24 +11:00
parent 96527c3cf2
commit 802262c0af
1 changed files with 4 additions and 0 deletions
--- a/src/compiler/glsl/lower_buffer_access.cpp
+++ b/src/compiler/glsl/lower_buffer_access.cpp
@@ -440,6 +440,10 @@ lower_buffer_access::setup_buffer_access(void *mem_ctx,
            else
               field_align = type->std140_base_alignment(field_row_major);

+            if (struct_type->fields.structure[i].offset != -1) {
+               intra_struct_offset = struct_type->fields.structure[i].offset;
+            }
+
            intra_struct_offset = glsl_align(intra_struct_offset, field_align);

            if (strcmp(struct_type->fields.structure[i].name,