fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 02:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: apply xfb_stride to implicit offsets for ifc block members

Browse source 
When we have an interface block like:

layout (xfb_buffer = 0, xfb_offset = 0) out Block {
                             vec4 var1;
    layout (xfb_stride = 32) vec4 var2;
                             vec4 var3;
};

We take into account the stride of var2 when calculating the offset
for var3.

Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Timothy Arceri 2016-03-10 11:51:48 +11:00
parent 04a72e6e57
commit 598790e856
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/compiler/glsl/ast_to_hir.cpp
View file

@ -54,6 +54,7 @@
#include "ast.h" #include "ast.h"
#include "compiler/glsl_types.h" #include "compiler/glsl_types.h"
#include "program/hash_table.h" #include "program/hash_table.h"
#include "main/macros.h"
#include "main/shaderobj.h" #include "main/shaderobj.h"
#include "ir.h" #include "ir.h"
#include "ir_builder.h" #include "ir_builder.h"
@ -6711,13 +6712,14 @@ ast_process_struct_or_iface_block_members(exec_list *instructions,
qual->offset, &xfb_offset)) { qual->offset, &xfb_offset)) {
fields[i].offset = xfb_offset; fields[i].offset = xfb_offset;
block_xfb_offset = fields[i].offset + block_xfb_offset = fields[i].offset +
4 * field_type->component_slots(); MAX2(xfb_stride, (int) (4 * field_type->component_slots()));
} }
} else { } else {
if (layout && layout->flags.q.explicit_xfb_offset) { if (layout && layout->flags.q.explicit_xfb_offset) {
unsigned align = field_type->is_double() ? 8 : 4; unsigned align = field_type->is_double() ? 8 : 4;
fields[i].offset = glsl_align(block_xfb_offset, align); fields[i].offset = glsl_align(block_xfb_offset, align);
block_xfb_offset += 4 * field_type->component_slots(); block_xfb_offset +=
MAX2(xfb_stride, (int) (4 * field_type->component_slots()));
} }
} }