diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-22 08:50:11 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-22 08:50:11 +0100 |
| commit | 697f071e3dcd3b01dba050d6c5316f2a23ee82f8 (patch) | |
| tree | 78ab3ffa70b85d25940220d8768c304889c24a85 /mesalib/src/glsl/linker.cpp | |
| parent | bb953a87489963f63e65c797a1f2837382ff7808 (diff) | |
| download | vcxsrv-697f071e3dcd3b01dba050d6c5316f2a23ee82f8.tar.gz vcxsrv-697f071e3dcd3b01dba050d6c5316f2a23ee82f8.tar.bz2 vcxsrv-697f071e3dcd3b01dba050d6c5316f2a23ee82f8.zip | |
libxtrans mesa git update 22 nov 2013
libxtrans commit 8b2c8aabe27bcaa4de6432b53c4a1296010ea823
mesa commit bb354c6c279031dafc08029a62cd3e76a6c1ca71
Diffstat (limited to 'mesalib/src/glsl/linker.cpp')
| -rw-r--r-- | mesalib/src/glsl/linker.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp index 1d53b6599..fac186a63 100644 --- a/mesalib/src/glsl/linker.cpp +++ b/mesalib/src/glsl/linker.cpp @@ -2154,8 +2154,8 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) if (prog->_LinkedShaders[i] == NULL) continue; - validate_interstage_interface_blocks(prog, prog->_LinkedShaders[prev], - prog->_LinkedShaders[i]); + validate_interstage_inout_blocks(prog, prog->_LinkedShaders[prev], + prog->_LinkedShaders[i]); if (!prog->LinkStatus) goto done; @@ -2168,6 +2168,11 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) prev = i; } + /* Cross-validate uniform blocks between shader stages */ + validate_interstage_uniform_blocks(prog, prog->_LinkedShaders, + MESA_SHADER_TYPES); + if (!prog->LinkStatus) + goto done; for (unsigned int i = 0; i < MESA_SHADER_TYPES; i++) { if (prog->_LinkedShaders[i] != NULL) |