diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-22 14:27:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-22 14:27:38 +0100 |
| commit | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (patch) | |
| tree | 2fbbd202a6a4243f0e64a8b22e22417a609ae19d /mesalib/src/glsl/linker.cpp | |
| parent | 50c07563e17397daf040a32d8fdd3ab397e72371 (diff) | |
| parent | 470f7ca9f0be348faf2f03fc16811844c5eeffce (diff) | |
| download | vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.gz vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.bz2 vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config
Conflicts:
mesalib/src/mesa/main/syncobj.c
mesalib/src/mesa/main/syncobj.h
xorg-server/hw/xwin/winconfig.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
Diffstat (limited to 'mesalib/src/glsl/linker.cpp')
| -rw-r--r-- | mesalib/src/glsl/linker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp index 70f3d5bed..63548e071 100644 --- a/mesalib/src/glsl/linker.cpp +++ b/mesalib/src/glsl/linker.cpp @@ -885,8 +885,8 @@ link_intrastage_shaders(void *mem_ctx, for (unsigned i = 0; i < num_shaders; i++) { struct gl_shader *sh = shader_list[i]; - for (unsigned j = 0; j < shader_list[i]->NumUniformBlocks; j++) { - link_assign_uniform_block_offsets(shader_list[i]); + for (unsigned j = 0; j < sh->NumUniformBlocks; j++) { + link_assign_uniform_block_offsets(sh); int index = link_cross_validate_uniform_block(mem_ctx, &uniform_blocks, |