diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-29 11:28:12 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-29 11:28:12 +0100 |
| commit | 52cd3051ba15ddda117f8d8cae1979cd3c86f5b6 (patch) | |
| tree | fbfed14bbfb67daadbff4b0a77b2f6587ffc71d5 /mesalib/src/glsl/linker.cpp | |
| parent | 7a80ea1b5dd2eb54717fdcc427912a9764e7719f (diff) | |
| parent | c043f97a8572e1f509251288d8bcd70d0fb96770 (diff) | |
| download | vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.tar.gz vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.tar.bz2 vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 29 Nov 2013
Diffstat (limited to 'mesalib/src/glsl/linker.cpp')
| -rw-r--r-- | mesalib/src/glsl/linker.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp index fac186a63..1366077f7 100644 --- a/mesalib/src/glsl/linker.cpp +++ b/mesalib/src/glsl/linker.cpp @@ -2396,6 +2396,11 @@ done: if (prog->_LinkedShaders[i] == NULL) continue; + /* Do a final validation step to make sure that the IR wasn't + * invalidated by any modifications performed after intrastage linking. + */ + validate_ir_tree(prog->_LinkedShaders[i]->ir); + /* Retain any live IR, but trash the rest. */ reparent_ir(prog->_LinkedShaders[i]->ir, prog->_LinkedShaders[i]->ir); |