From 8d86f8c566c4181c846a872a5a2f88718e635a72 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 26 Oct 2012 08:09:05 +0200
Subject: fontconfig pixman mesa git update 26 oct 2012

fontconfig: 038aa930ae2c3b7972eefe334917e7222fe478ec
mesa: 8fb4b1dce156d02a0907925364d8945915c29bcf
pixman: 4b91f6ca72db3e8cbd7e97e9ef44be2f8994040d
---
 mesalib/src/glsl/linker.cpp | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp
index 34ce13372..86371b5e6 100644
--- a/mesalib/src/glsl/linker.cpp
+++ b/mesalib/src/glsl/linker.cpp
@@ -882,6 +882,7 @@ move_non_declarations(exec_list *instructions, exec_node *last,
 
       assert(inst->as_assignment()
              || inst->as_call()
+             || inst->as_if() /* for initializers with the ?: operator */
 	     || ((var != NULL) && (var->mode == ir_var_temporary)));
 
       if (make_copies) {
-- 
cgit v1.2.3