From c043f97a8572e1f509251288d8bcd70d0fb96770 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 29 Nov 2013 11:25:56 +0100
Subject: fontconfig mesa xserver git update 29 Nov 2013

xserver          commit d695cb7fb6bb8fd159a332d902673edbbd2237d7
fontconfig       commit a5fd7912ff8c7bc72d2cdbd0038c7ff0c968831f
mesa             commit fb5f5b81883f360dcbbf407a0f6f5606bc0c0495
---
 mesalib/src/glsl/linker.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'mesalib/src/glsl/linker.cpp')

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);
 
-- 
cgit v1.2.3