diff options
author | marha <marha@users.sourceforge.net> | 2013-08-01 13:25:23 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-08-01 13:25:23 +0200 |
commit | c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (patch) | |
tree | f86937d9126b2d543ffd13f861a1271f48bd69e6 /mesalib/src/glsl/link_uniform_blocks.cpp | |
parent | acad661e29a4f09d06f829fdfea949814da57da6 (diff) | |
parent | 0659c77949b38440a2a9ba67e1ee9cacef1f3a7f (diff) | |
download | vcxsrv-c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d.tar.gz vcxsrv-c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d.tar.bz2 vcxsrv-c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa xserver xkeyboard-config git update 1 aug 2013
Diffstat (limited to 'mesalib/src/glsl/link_uniform_blocks.cpp')
-rw-r--r-- | mesalib/src/glsl/link_uniform_blocks.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/link_uniform_blocks.cpp b/mesalib/src/glsl/link_uniform_blocks.cpp index c72d1d8f1..1083653c7 100644 --- a/mesalib/src/glsl/link_uniform_blocks.cpp +++ b/mesalib/src/glsl/link_uniform_blocks.cpp @@ -137,7 +137,7 @@ struct block { bool has_instance_name; }; -int +unsigned link_uniform_blocks(void *mem_ctx, struct gl_shader_program *prog, struct gl_shader **shader_list, |