diff options
| author | Eric Anholt <eric@anholt.net> | 2012-04-27 13:52:56 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-07-20 10:43:28 -0700 |
| commit | f609cf782ab5e90ddf045dc4b0da8cebf99be0d1 (patch) | |
| tree | 7f54da76e408a733a9bb82e8242ada78fb6063f4 /src/glsl/linker.h | |
| parent | b3c093c79c2ec49c36af37aa290d5ae452149f6e (diff) | |
| download | external_mesa3d-f609cf782ab5e90ddf045dc4b0da8cebf99be0d1.zip external_mesa3d-f609cf782ab5e90ddf045dc4b0da8cebf99be0d1.tar.gz external_mesa3d-f609cf782ab5e90ddf045dc4b0da8cebf99be0d1.tar.bz2 | |
glsl: Merge the lists of uniform blocks into the linked shader program.
This attempts error-checking, but the layout isn't done yet.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/linker.h')
| -rw-r--r-- | src/glsl/linker.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/glsl/linker.h b/src/glsl/linker.h index d0aaf3e..5c54437 100644 --- a/src/glsl/linker.h +++ b/src/glsl/linker.h @@ -40,6 +40,12 @@ link_assign_uniform_locations(struct gl_shader_program *prog); extern void link_set_uniform_initializers(struct gl_shader_program *prog); +extern int +link_cross_validate_uniform_block(void *mem_ctx, + struct gl_uniform_block **linked_blocks, + unsigned int *num_linked_blocks, + struct gl_uniform_block *new_block); + /** * Class for processing all of the leaf fields of an uniform * |