From 18e75aa6ae27a6e44d93babd96afbbe0cd6077c8 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 3 Aug 2012 08:16:19 +0200
Subject: pixman mesa git update 3 Aug 2012

---
 mesalib/src/mesa/program/prog_statevars.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'mesalib/src/mesa/program')

diff --git a/mesalib/src/mesa/program/prog_statevars.c b/mesalib/src/mesa/program/prog_statevars.c
index 3d1338674..91212218e 100644
--- a/mesalib/src/mesa/program/prog_statevars.c
+++ b/mesalib/src/mesa/program/prog_statevars.c
@@ -37,6 +37,7 @@
 #include "main/fbobject.h"
 #include "prog_statevars.h"
 #include "prog_parameter.h"
+#include "main/samplerobj.h"
 
 
 /**
@@ -555,11 +556,13 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[],
             const int unit = (int) state[2];
             const struct gl_texture_object *texObj
                = ctx->Texture.Unit[unit]._Current;
+            const struct gl_sampler_object *samp =
+               _mesa_get_samplerobj(ctx, unit);
             if (texObj) {
                value[0] =
                value[1] =
                value[2] =
-               value[3] = texObj->Sampler.CompareFailValue;
+               value[3] = samp->CompareFailValue;
             }
          }
          return;
-- 
cgit v1.2.3