diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-04-03 12:44:33 +1000 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-04-06 09:56:24 +1000 |
| commit | f1293b2f9bc3a45c71941931edb5148d7b5f5a27 (patch) | |
| tree | ba998230fc2b04bf8d130b6d7704650dbba09e83 /src/compiler/glsl/linker.h | |
| parent | 506b561ba7e3df2a7759dded684fae84bf459f65 (diff) | |
| download | external_mesa3d-f1293b2f9bc3a45c71941931edb5148d7b5f5a27.zip external_mesa3d-f1293b2f9bc3a45c71941931edb5148d7b5f5a27.tar.gz external_mesa3d-f1293b2f9bc3a45c71941931edb5148d7b5f5a27.tar.bz2 | |
glsl: fully split apart buffer block arrays
With this change we create the UBO and SSBO arrays separately from the
beginning rather than putting them into a combined array and splitting
it apart later.
A bug is with UBO and SSBO stage reference querying is also fixed as
we now use the block index to lookup the references in the separate arrays
not the combined buffer block array.
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Diffstat (limited to 'src/compiler/glsl/linker.h')
| -rw-r--r-- | src/compiler/glsl/linker.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/compiler/glsl/linker.h b/src/compiler/glsl/linker.h index 97144df..3a0ec8b 100644 --- a/src/compiler/glsl/linker.h +++ b/src/compiler/glsl/linker.h @@ -53,13 +53,16 @@ extern bool link_uniform_blocks_are_compatible(const gl_uniform_block *a, const gl_uniform_block *b); -extern unsigned +extern void link_uniform_blocks(void *mem_ctx, struct gl_context *ctx, struct gl_shader_program *prog, struct gl_shader **shader_list, unsigned num_shaders, - struct gl_uniform_block **blocks_ret); + struct gl_uniform_block **ubo_blocks, + unsigned *num_ubo_blocks, + struct gl_uniform_block **ssbo_blocks, + unsigned *num_ssbo_blocks); bool validate_intrastage_arrays(struct gl_shader_program *prog, |