diff options
author | marha <marha@users.sourceforge.net> | 2013-08-01 13:22:08 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-08-01 13:22:08 +0200 |
commit | 0659c77949b38440a2a9ba67e1ee9cacef1f3a7f (patch) | |
tree | 891077ab7001a45e0e37ff2e554db0c56671acdc /mesalib/src/glsl/linker.h | |
parent | 4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a (diff) | |
download | vcxsrv-0659c77949b38440a2a9ba67e1ee9cacef1f3a7f.tar.gz vcxsrv-0659c77949b38440a2a9ba67e1ee9cacef1f3a7f.tar.bz2 vcxsrv-0659c77949b38440a2a9ba67e1ee9cacef1f3a7f.zip |
libX11 mesa xserver xkeyboard-config git update 1 aug 2013
xserver commit b6e5c4669e0db391966deb397e8c975ec7f0124d
xkeyboard-config commit abaf14335dc6504e59d91e77babc8e034df5beb7
libX11 commit 44f84223f5e2dd46883fcbd352af2798bfa9aeb6
mesa commit 3eef7fec677f40eef1674e44e7ebd836bc7f8612
Diffstat (limited to 'mesalib/src/glsl/linker.h')
-rw-r--r-- | mesalib/src/glsl/linker.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mesalib/src/glsl/linker.h b/mesalib/src/glsl/linker.h index 2fe2410c2..0ce747d6c 100644 --- a/mesalib/src/glsl/linker.h +++ b/mesalib/src/glsl/linker.h @@ -53,19 +53,21 @@ extern bool link_uniform_blocks_are_compatible(const gl_uniform_block *a, const gl_uniform_block *b); -extern int +extern unsigned link_uniform_blocks(void *mem_ctx, struct gl_shader_program *prog, struct gl_shader **shader_list, unsigned num_shaders, struct gl_uniform_block **blocks_ret); -bool -validate_intrastage_interface_blocks(const gl_shader **shader_list, +void +validate_intrastage_interface_blocks(struct gl_shader_program *prog, + const gl_shader **shader_list, unsigned num_shaders); -bool -validate_interstage_interface_blocks(const gl_shader *producer, +void +validate_interstage_interface_blocks(struct gl_shader_program *prog, + const gl_shader *producer, const gl_shader *consumer); /** |