mesa xserver git update 15 June 2011

7 files changed, 989 insertions, 984 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_atom_blend.c b/mesalib/src/mesa/state_tracker/st_atom_blend.c
index d1844e106..4c9a2b95a 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_blend.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_blend.c
@@ -156,7 +156,7 @@ translate_logicop(GLenum logicop)
  * Figure out if colormasks are different per rt.
  */
 static GLboolean
-colormask_per_rt(struct gl_context *ctx)
+colormask_per_rt(const struct gl_context *ctx)
 {
    /* a bit suboptimal have to compare lots of values */
    unsigned i;
@@ -172,7 +172,7 @@ colormask_per_rt(struct gl_context *ctx)
  * Figure out if blend enables/state are different per rt.
  */
 static GLboolean
-blend_per_rt(struct gl_context *ctx)
+blend_per_rt(const struct gl_context *ctx)
 {
    if (ctx->Color.BlendEnabled &&
       (ctx->Color.BlendEnabled != ((1 << ctx->Const.MaxDrawBuffers) - 1))) {
@@ -190,13 +190,14 @@ static void
 update_blend( struct st_context *st )
 {
    struct pipe_blend_state *blend = &st->state.blend;
+   const struct gl_context *ctx = st->ctx;
    unsigned num_state = 1;
    unsigned i, j;
 
    memset(blend, 0, sizeof(*blend));
 
-   if (blend_per_rt(st->ctx) || colormask_per_rt(st->ctx)) {
-      num_state = st->ctx->Const.MaxDrawBuffers;
+   if (blend_per_rt(ctx) || colormask_per_rt(ctx)) {
+      num_state = ctx->Const.MaxDrawBuffers;
       blend->independent_blend_enable = 1;
    }
    /* Note it is impossible to correctly deal with EXT_blend_logic_op and
@@ -205,52 +206,52 @@ update_blend( struct st_context *st )
       and separate alpha/rgb logicop/blend support respectively. Neither
       possible in gallium nor most hardware. Assume these combinations
       don't happen. */
-   if (st->ctx->Color.ColorLogicOpEnabled ||
-       (st->ctx->Color.BlendEnabled &&
-        st->ctx->Color.Blend[0].EquationRGB == GL_LOGIC_OP)) {
+   if (ctx->Color.ColorLogicOpEnabled ||
+       (ctx->Color.BlendEnabled &&
+        ctx->Color.Blend[0].EquationRGB == GL_LOGIC_OP)) {
       /* logicop enabled */
       blend->logicop_enable = 1;
-      blend->logicop_func = translate_logicop(st->ctx->Color.LogicOp);
+      blend->logicop_func = translate_logicop(ctx->Color.LogicOp);
    }
-   else if (st->ctx->Color.BlendEnabled) {
+   else if (ctx->Color.BlendEnabled) {
       /* blending enabled */
       for (i = 0, j = 0; i < num_state; i++) {
 
-         blend->rt[i].blend_enable = (st->ctx->Color.BlendEnabled >> i) & 0x1;
+         blend->rt[i].blend_enable = (ctx->Color.BlendEnabled >> i) & 0x1;
 
-         if (st->ctx->Extensions.ARB_draw_buffers_blend)
+         if (ctx->Extensions.ARB_draw_buffers_blend)
             j = i;
 
          blend->rt[i].rgb_func =
-            translate_blend(st->ctx->Color.Blend[j].EquationRGB);
+            translate_blend(ctx->Color.Blend[j].EquationRGB);
 
-         if (st->ctx->Color.Blend[i].EquationRGB == GL_MIN ||
-             st->ctx->Color.Blend[i].EquationRGB == GL_MAX) {
+         if (ctx->Color.Blend[i].EquationRGB == GL_MIN ||
+             ctx->Color.Blend[i].EquationRGB == GL_MAX) {
             /* Min/max are special */
             blend->rt[i].rgb_src_factor = PIPE_BLENDFACTOR_ONE;
             blend->rt[i].rgb_dst_factor = PIPE_BLENDFACTOR_ONE;
          }
          else {
             blend->rt[i].rgb_src_factor =
-               translate_blend(st->ctx->Color.Blend[j].SrcRGB);
+               translate_blend(ctx->Color.Blend[j].SrcRGB);
             blend->rt[i].rgb_dst_factor =
-               translate_blend(st->ctx->Color.Blend[j].DstRGB);
+               translate_blend(ctx->Color.Blend[j].DstRGB);
          }
 
          blend->rt[i].alpha_func =
-            translate_blend(st->ctx->Color.Blend[j].EquationA);
+            translate_blend(ctx->Color.Blend[j].EquationA);
 
-         if (st->ctx->Color.Blend[i].EquationA == GL_MIN ||
-             st->ctx->Color.Blend[i].EquationA == GL_MAX) {
+         if (ctx->Color.Blend[i].EquationA == GL_MIN ||
+             ctx->Color.Blend[i].EquationA == GL_MAX) {
             /* Min/max are special */
             blend->rt[i].alpha_src_factor = PIPE_BLENDFACTOR_ONE;
             blend->rt[i].alpha_dst_factor = PIPE_BLENDFACTOR_ONE;
          }
          else {
             blend->rt[i].alpha_src_factor =
-               translate_blend(st->ctx->Color.Blend[j].SrcA);
+               translate_blend(ctx->Color.Blend[j].SrcA);
             blend->rt[i].alpha_dst_factor =
-               translate_blend(st->ctx->Color.Blend[j].DstA);
+               translate_blend(ctx->Color.Blend[j].DstA);
          }
       }
    }
@@ -260,25 +261,25 @@ update_blend( struct st_context *st )
 
    /* Colormask - maybe reverse these bits? */
    for (i = 0; i < num_state; i++) {
-      if (st->ctx->Color.ColorMask[i][0])
+      if (ctx->Color.ColorMask[i][0])
          blend->rt[i].colormask |= PIPE_MASK_R;
-      if (st->ctx->Color.ColorMask[i][1])
+      if (ctx->Color.ColorMask[i][1])
          blend->rt[i].colormask |= PIPE_MASK_G;
-      if (st->ctx->Color.ColorMask[i][2])
+      if (ctx->Color.ColorMask[i][2])
          blend->rt[i].colormask |= PIPE_MASK_B;
-      if (st->ctx->Color.ColorMask[i][3])
+      if (ctx->Color.ColorMask[i][3])
          blend->rt[i].colormask |= PIPE_MASK_A;
    }
 
-   if (st->ctx->Color.DitherFlag)
+   if (ctx->Color.DitherFlag)
       blend->dither = 1;
 
-   if (st->ctx->Multisample.Enabled) {
+   if (ctx->Multisample.Enabled) {
       /* unlike in gallium/d3d10 these operations are only performed
          if msaa is enabled */
-      if (st->ctx->Multisample.SampleAlphaToCoverage)
+      if (ctx->Multisample.SampleAlphaToCoverage)
          blend->alpha_to_coverage = 1;
-      if (st->ctx->Multisample.SampleAlphaToOne)
+      if (ctx->Multisample.SampleAlphaToOne)
          blend->alpha_to_one = 1;
    }
 
@@ -286,7 +287,7 @@ update_blend( struct st_context *st )
 
    {
       struct pipe_blend_color bc;
-      COPY_4FV(bc.color, st->ctx->Color.BlendColorUnclamped);
+      COPY_4FV(bc.color, ctx->Color.BlendColorUnclamped);
       cso_set_blend_color(st->cso_context, &bc);
    }
 }
diff --git a/mesalib/src/mesa/state_tracker/st_atom_clip.c b/mesalib/src/mesa/state_tracker/st_atom_clip.c
index 24d479a74..1330db843 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_clip.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_clip.c
@@ -1,75 +1,76 @@
-/**************************************************************************

- * 

- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

- * All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- * 

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- * 

- **************************************************************************/

-

- /*

-  * Authors:

-  *   Keith Whitwell <keith@tungstengraphics.com>

-  */

- 

-

-#include "st_context.h"

-#include "pipe/p_context.h"

-#include "st_atom.h"

-

-#include "cso_cache/cso_context.h"

-

-

-/* Second state atom for user clip planes:

- */

-static void update_clip( struct st_context *st )

-{

-   struct pipe_clip_state clip;

-   GLuint i;

-

-   memset(&clip, 0, sizeof(clip));

-

-   for (i = 0; i < PIPE_MAX_CLIP_PLANES; i++) {

-      if (st->ctx->Transform.ClipPlanesEnabled & (1 << i)) {

-	 memcpy(clip.ucp[clip.nr], 

-		st->ctx->Transform._ClipUserPlane[i], 

-		sizeof(clip.ucp[0]));

-	 clip.nr++;

-      }

-   }

-

-   clip.depth_clamp = st->ctx->Transform.DepthClamp != GL_FALSE;

-      

-   if (memcmp(&clip, &st->state.clip, sizeof(clip)) != 0) {

-      st->state.clip = clip;

-      cso_set_clip(st->cso_context, &clip);

-   }

-}

-

-

-const struct st_tracked_state st_update_clip = {

-   "st_update_clip",					/* name */

-   {							/* dirty */

-      (_NEW_TRANSFORM),					/* mesa */

-      0,						/* st */

-   },

-   update_clip						/* update */

-};

+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+ /*
+  * Authors:
+  *   Keith Whitwell <keith@tungstengraphics.com>
+  */
+ 
+
+#include "st_context.h"
+#include "pipe/p_context.h"
+#include "st_atom.h"
+
+#include "cso_cache/cso_context.h"
+
+
+/* Second state atom for user clip planes:
+ */
+static void update_clip( struct st_context *st )
+{
+   struct pipe_clip_state clip;
+   const struct gl_context *ctx = st->ctx;
+   GLuint i;
+
+   memset(&clip, 0, sizeof(clip));
+
+   for (i = 0; i < PIPE_MAX_CLIP_PLANES; i++) {
+      if (ctx->Transform.ClipPlanesEnabled & (1 << i)) {
+	 memcpy(clip.ucp[clip.nr], 
+		ctx->Transform._ClipUserPlane[i], 
+		sizeof(clip.ucp[0]));
+	 clip.nr++;
+      }
+   }
+
+   clip.depth_clamp = ctx->Transform.DepthClamp != GL_FALSE;
+      
+   if (memcmp(&clip, &st->state.clip, sizeof(clip)) != 0) {
+      st->state.clip = clip;
+      cso_set_clip(st->cso_context, &clip);
+   }
+}
+
+
+const struct st_tracked_state st_update_clip = {
+   "st_update_clip",					/* name */
+   {							/* dirty */
+      (_NEW_TRANSFORM),					/* mesa */
+      0,						/* st */
+   },
+   update_clip						/* update */
+};
diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
index 627a13387..731338f9b 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_sampler.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
@@ -1,271 +1,279 @@
-/**************************************************************************

- * 

- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

- * All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- * 

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- * 

- **************************************************************************/

-

- /*

-  * Authors:

-  *   Keith Whitwell <keith@tungstengraphics.com>

-  *   Brian Paul

-  */

- 

-

-#include "main/macros.h"

-#include "main/mtypes.h"

-#include "main/samplerobj.h"

-

-#include "st_context.h"

-#include "st_cb_texture.h"

-#include "st_format.h"

-#include "st_atom.h"

-#include "st_texture.h"

-#include "pipe/p_context.h"

-#include "pipe/p_defines.h"

-

-#include "cso_cache/cso_context.h"

-

-

-/**

- * Convert GLenum texcoord wrap tokens to pipe tokens.

- */

-static GLuint

-gl_wrap_xlate(GLenum wrap)

-{

-   switch (wrap) {

-   case GL_REPEAT:

-      return PIPE_TEX_WRAP_REPEAT;

-   case GL_CLAMP:

-      return PIPE_TEX_WRAP_CLAMP;

-   case GL_CLAMP_TO_EDGE:

-      return PIPE_TEX_WRAP_CLAMP_TO_EDGE;

-   case GL_CLAMP_TO_BORDER:

-      return PIPE_TEX_WRAP_CLAMP_TO_BORDER;

-   case GL_MIRRORED_REPEAT:

-      return PIPE_TEX_WRAP_MIRROR_REPEAT;

-   case GL_MIRROR_CLAMP_EXT:

-      return PIPE_TEX_WRAP_MIRROR_CLAMP;

-   case GL_MIRROR_CLAMP_TO_EDGE_EXT:

-      return PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE;

-   case GL_MIRROR_CLAMP_TO_BORDER_EXT:

-      return PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER;

-   default:

-      assert(0);

-      return 0;

-   }

-}

-

-

-static GLuint

-gl_filter_to_mip_filter(GLenum filter)

-{

-   switch (filter) {

-   case GL_NEAREST:

-   case GL_LINEAR:

-      return PIPE_TEX_MIPFILTER_NONE;

-

-   case GL_NEAREST_MIPMAP_NEAREST:

-   case GL_LINEAR_MIPMAP_NEAREST:

-      return PIPE_TEX_MIPFILTER_NEAREST;

-

-   case GL_NEAREST_MIPMAP_LINEAR:

-   case GL_LINEAR_MIPMAP_LINEAR:

-      return PIPE_TEX_MIPFILTER_LINEAR;

-

-   default:

-      assert(0);

-      return PIPE_TEX_MIPFILTER_NONE;

-   }

-}

-

-

-static GLuint

-gl_filter_to_img_filter(GLenum filter)

-{

-   switch (filter) {

-   case GL_NEAREST:

-   case GL_NEAREST_MIPMAP_NEAREST:

-   case GL_NEAREST_MIPMAP_LINEAR:

-      return PIPE_TEX_FILTER_NEAREST;

-

-   case GL_LINEAR:

-   case GL_LINEAR_MIPMAP_NEAREST:

-   case GL_LINEAR_MIPMAP_LINEAR:

-      return PIPE_TEX_FILTER_LINEAR;

-

-   default:

-      assert(0);

-      return PIPE_TEX_FILTER_NEAREST;

-   }

-}

-

-static void convert_sampler(struct st_context *st,

-			    struct pipe_sampler_state *sampler,

-			    GLuint texUnit)

-{

-    struct gl_texture_object *texobj;

-    struct gl_sampler_object *msamp;

-

-    texobj = st->ctx->Texture.Unit[texUnit]._Current;

-    if (!texobj) {

-	texobj = st_get_default_texture(st);

-    }

-

-    msamp = _mesa_get_samplerobj(st->ctx, texUnit);

-

-    memset(sampler, 0, sizeof(*sampler));

-    sampler->wrap_s = gl_wrap_xlate(msamp->WrapS);

-    sampler->wrap_t = gl_wrap_xlate(msamp->WrapT);

-    sampler->wrap_r = gl_wrap_xlate(msamp->WrapR);

-

-    sampler->min_img_filter = gl_filter_to_img_filter(msamp->MinFilter);

-    sampler->min_mip_filter = gl_filter_to_mip_filter(msamp->MinFilter);

-    sampler->mag_img_filter = gl_filter_to_img_filter(msamp->MagFilter);

-

-    if (texobj->Target != GL_TEXTURE_RECTANGLE_ARB)

-       sampler->normalized_coords = 1;

-

-    sampler->lod_bias = st->ctx->Texture.Unit[texUnit].LodBias +

-       msamp->LodBias;

-

-    sampler->min_lod = CLAMP(msamp->MinLod,

-			     0.0f,

-			     (GLfloat) texobj->MaxLevel - texobj->BaseLevel);

-    sampler->max_lod = MIN2((GLfloat) texobj->MaxLevel - texobj->BaseLevel,

-			    msamp->MaxLod);

-    if (sampler->max_lod < sampler->min_lod) {

-       /* The GL spec doesn't seem to specify what to do in this case.

-	* Swap the values.

-	*/

-       float tmp = sampler->max_lod;

-       sampler->max_lod = sampler->min_lod;

-       sampler->min_lod = tmp;

-       assert(sampler->min_lod <= sampler->max_lod);

-    }

-

-    if (msamp->BorderColor.ui[0] ||

-	msamp->BorderColor.ui[1] ||

-	msamp->BorderColor.ui[2] ||

-	msamp->BorderColor.ui[3]) {

-       struct gl_texture_image *teximg;

-

-       teximg = texobj->Image[0][texobj->BaseLevel];

-

-       st_translate_color(msamp->BorderColor.f,

-			  teximg ? teximg->_BaseFormat : GL_RGBA,

-			  sampler->border_color);

-    }

-

-    sampler->max_anisotropy = (msamp->MaxAnisotropy == 1.0 ?

-			       0 : (GLuint) msamp->MaxAnisotropy);

-

-    /* only care about ARB_shadow, not SGI shadow */

-    if (msamp->CompareMode == GL_COMPARE_R_TO_TEXTURE) {

-       sampler->compare_mode = PIPE_TEX_COMPARE_R_TO_TEXTURE;

-       sampler->compare_func

-	  = st_compare_func_to_pipe(msamp->CompareFunc);

-    }

-

-    sampler->seamless_cube_map =

-       st->ctx->Texture.CubeMapSeamless || msamp->CubeMapSeamless;

-}

-

-static void

-update_vertex_samplers(struct st_context *st)

-{

-   struct gl_vertex_program *vprog = st->ctx->VertexProgram._Current;

-   GLuint su;

-

-   st->state.num_vertex_samplers = 0;

-

-   /* loop over sampler units (aka tex image units) */

-   for (su = 0; su < st->ctx->Const.MaxVertexTextureImageUnits; su++) {

-      struct pipe_sampler_state *sampler = st->state.vertex_samplers + su;

-

-      if (vprog->Base.SamplersUsed & (1 << su)) {

-	 GLuint texUnit;

-

-	 texUnit = vprog->Base.SamplerUnits[su];

-

-	 convert_sampler(st, sampler, texUnit);

-

-	 st->state.num_vertex_samplers = su + 1;

-

-	 cso_single_vertex_sampler(st->cso_context, su, sampler);

-      } else {

-	 cso_single_vertex_sampler(st->cso_context, su, NULL);

-      }

-   }

-   cso_single_vertex_sampler_done(st->cso_context);

-}

-

-static void

-update_fragment_samplers(struct st_context *st)

-{

-   struct gl_fragment_program *fprog = st->ctx->FragmentProgram._Current;

-   GLuint su;

-

-   st->state.num_samplers = 0;

-

-   /* loop over sampler units (aka tex image units) */

-   for (su = 0; su < st->ctx->Const.MaxTextureImageUnits; su++) {

-      struct pipe_sampler_state *sampler = st->state.samplers + su;

-

-

-      if (fprog->Base.SamplersUsed & (1 << su)) {

-         GLuint texUnit;

-

-	 texUnit = fprog->Base.SamplerUnits[su];

-

-	 convert_sampler(st, sampler, texUnit);

-

-         st->state.num_samplers = su + 1;

-

-         /*printf("%s su=%u non-null\n", __FUNCTION__, su);*/

-         cso_single_sampler(st->cso_context, su, sampler);

-      }

-      else {

-         /*printf("%s su=%u null\n", __FUNCTION__, su);*/

-         cso_single_sampler(st->cso_context, su, NULL);

-      }

-   }

-

-   cso_single_sampler_done(st->cso_context);

-}

-

-static void

-update_samplers(struct st_context *st)

-{

-    update_fragment_samplers(st);

-    update_vertex_samplers(st);

-}

-

-const struct st_tracked_state st_update_sampler = {

-   "st_update_sampler",					/* name */

-   {							/* dirty */

-      _NEW_TEXTURE,					/* mesa */

-      0,						/* st */

-   },

-   update_samplers					/* update */

-};

+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+ /*
+  * Authors:
+  *   Keith Whitwell <keith@tungstengraphics.com>
+  *   Brian Paul
+  */
+ 
+
+#include "main/macros.h"
+#include "main/mtypes.h"
+#include "main/samplerobj.h"
+
+#include "st_context.h"
+#include "st_cb_texture.h"
+#include "st_format.h"
+#include "st_atom.h"
+#include "st_texture.h"
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
+
+#include "cso_cache/cso_context.h"
+
+
+/**
+ * Convert GLenum texcoord wrap tokens to pipe tokens.
+ */
+static GLuint
+gl_wrap_xlate(GLenum wrap)
+{
+   switch (wrap) {
+   case GL_REPEAT:
+      return PIPE_TEX_WRAP_REPEAT;
+   case GL_CLAMP:
+      return PIPE_TEX_WRAP_CLAMP;
+   case GL_CLAMP_TO_EDGE:
+      return PIPE_TEX_WRAP_CLAMP_TO_EDGE;
+   case GL_CLAMP_TO_BORDER:
+      return PIPE_TEX_WRAP_CLAMP_TO_BORDER;
+   case GL_MIRRORED_REPEAT:
+      return PIPE_TEX_WRAP_MIRROR_REPEAT;
+   case GL_MIRROR_CLAMP_EXT:
+      return PIPE_TEX_WRAP_MIRROR_CLAMP;
+   case GL_MIRROR_CLAMP_TO_EDGE_EXT:
+      return PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE;
+   case GL_MIRROR_CLAMP_TO_BORDER_EXT:
+      return PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER;
+   default:
+      assert(0);
+      return 0;
+   }
+}
+
+
+static GLuint
+gl_filter_to_mip_filter(GLenum filter)
+{
+   switch (filter) {
+   case GL_NEAREST:
+   case GL_LINEAR:
+      return PIPE_TEX_MIPFILTER_NONE;
+
+   case GL_NEAREST_MIPMAP_NEAREST:
+   case GL_LINEAR_MIPMAP_NEAREST:
+      return PIPE_TEX_MIPFILTER_NEAREST;
+
+   case GL_NEAREST_MIPMAP_LINEAR:
+   case GL_LINEAR_MIPMAP_LINEAR:
+      return PIPE_TEX_MIPFILTER_LINEAR;
+
+   default:
+      assert(0);
+      return PIPE_TEX_MIPFILTER_NONE;
+   }
+}
+
+
+static GLuint
+gl_filter_to_img_filter(GLenum filter)
+{
+   switch (filter) {
+   case GL_NEAREST:
+   case GL_NEAREST_MIPMAP_NEAREST:
+   case GL_NEAREST_MIPMAP_LINEAR:
+      return PIPE_TEX_FILTER_NEAREST;
+
+   case GL_LINEAR:
+   case GL_LINEAR_MIPMAP_NEAREST:
+   case GL_LINEAR_MIPMAP_LINEAR:
+      return PIPE_TEX_FILTER_LINEAR;
+
+   default:
+      assert(0);
+      return PIPE_TEX_FILTER_NEAREST;
+   }
+}
+
+
+static void
+convert_sampler(struct st_context *st,
+                struct pipe_sampler_state *sampler,
+                GLuint texUnit)
+{
+   struct gl_texture_object *texobj;
+   struct gl_context *ctx = st->ctx;
+   struct gl_sampler_object *msamp;
+
+   texobj = ctx->Texture.Unit[texUnit]._Current;
+   if (!texobj) {
+      texobj = st_get_default_texture(st);
+   }
+
+   msamp = _mesa_get_samplerobj(ctx, texUnit);
+
+   memset(sampler, 0, sizeof(*sampler));
+   sampler->wrap_s = gl_wrap_xlate(msamp->WrapS);
+   sampler->wrap_t = gl_wrap_xlate(msamp->WrapT);
+   sampler->wrap_r = gl_wrap_xlate(msamp->WrapR);
+
+   sampler->min_img_filter = gl_filter_to_img_filter(msamp->MinFilter);
+   sampler->min_mip_filter = gl_filter_to_mip_filter(msamp->MinFilter);
+   sampler->mag_img_filter = gl_filter_to_img_filter(msamp->MagFilter);
+
+   if (texobj->Target != GL_TEXTURE_RECTANGLE_ARB)
+      sampler->normalized_coords = 1;
+
+   sampler->lod_bias = ctx->Texture.Unit[texUnit].LodBias + msamp->LodBias;
+
+   sampler->min_lod = CLAMP(msamp->MinLod,
+                            0.0f,
+                            (GLfloat) texobj->MaxLevel - texobj->BaseLevel);
+   sampler->max_lod = MIN2((GLfloat) texobj->MaxLevel - texobj->BaseLevel,
+                           msamp->MaxLod);
+   if (sampler->max_lod < sampler->min_lod) {
+      /* The GL spec doesn't seem to specify what to do in this case.
+       * Swap the values.
+       */
+      float tmp = sampler->max_lod;
+      sampler->max_lod = sampler->min_lod;
+      sampler->min_lod = tmp;
+      assert(sampler->min_lod <= sampler->max_lod);
+   }
+
+   if (msamp->BorderColor.ui[0] ||
+       msamp->BorderColor.ui[1] ||
+       msamp->BorderColor.ui[2] ||
+       msamp->BorderColor.ui[3]) {
+      struct gl_texture_image *teximg;
+
+      teximg = texobj->Image[0][texobj->BaseLevel];
+
+      st_translate_color(msamp->BorderColor.f,
+                         teximg ? teximg->_BaseFormat : GL_RGBA,
+                         sampler->border_color);
+   }
+
+   sampler->max_anisotropy = (msamp->MaxAnisotropy == 1.0 ?
+                              0 : (GLuint) msamp->MaxAnisotropy);
+
+   /* only care about ARB_shadow, not SGI shadow */
+   if (msamp->CompareMode == GL_COMPARE_R_TO_TEXTURE) {
+      sampler->compare_mode = PIPE_TEX_COMPARE_R_TO_TEXTURE;
+      sampler->compare_func
+         = st_compare_func_to_pipe(msamp->CompareFunc);
+   }
+
+   sampler->seamless_cube_map =
+      ctx->Texture.CubeMapSeamless || msamp->CubeMapSeamless;
+}
+
+
+static void
+update_vertex_samplers(struct st_context *st)
+{
+   const struct gl_context *ctx = st->ctx;
+   struct gl_vertex_program *vprog = ctx->VertexProgram._Current;
+   GLuint su;
+
+   st->state.num_vertex_samplers = 0;
+
+   /* loop over sampler units (aka tex image units) */
+   for (su = 0; su < ctx->Const.MaxVertexTextureImageUnits; su++) {
+      struct pipe_sampler_state *sampler = st->state.vertex_samplers + su;
+
+      if (vprog->Base.SamplersUsed & (1 << su)) {
+	 GLuint texUnit;
+
+	 texUnit = vprog->Base.SamplerUnits[su];
+
+	 convert_sampler(st, sampler, texUnit);
+
+	 st->state.num_vertex_samplers = su + 1;
+
+	 cso_single_vertex_sampler(st->cso_context, su, sampler);
+      } else {
+	 cso_single_vertex_sampler(st->cso_context, su, NULL);
+      }
+   }
+   cso_single_vertex_sampler_done(st->cso_context);
+}
+
+
+static void
+update_fragment_samplers(struct st_context *st)
+{
+   const struct gl_context *ctx = st->ctx;
+   struct gl_fragment_program *fprog = ctx->FragmentProgram._Current;
+   GLuint su;
+
+   st->state.num_samplers = 0;
+
+   /* loop over sampler units (aka tex image units) */
+   for (su = 0; su < ctx->Const.MaxTextureImageUnits; su++) {
+      struct pipe_sampler_state *sampler = st->state.samplers + su;
+
+
+      if (fprog->Base.SamplersUsed & (1 << su)) {
+         GLuint texUnit;
+
+	 texUnit = fprog->Base.SamplerUnits[su];
+
+	 convert_sampler(st, sampler, texUnit);
+
+         st->state.num_samplers = su + 1;
+
+         /*printf("%s su=%u non-null\n", __FUNCTION__, su);*/
+         cso_single_sampler(st->cso_context, su, sampler);
+      }
+      else {
+         /*printf("%s su=%u null\n", __FUNCTION__, su);*/
+         cso_single_sampler(st->cso_context, su, NULL);
+      }
+   }
+
+   cso_single_sampler_done(st->cso_context);
+}
+
+
+static void
+update_samplers(struct st_context *st)
+{
+    update_fragment_samplers(st);
+    update_vertex_samplers(st);
+}
+
+
+const struct st_tracked_state st_update_sampler = {
+   "st_update_sampler",					/* name */
+   {							/* dirty */
+      _NEW_TEXTURE,					/* mesa */
+      0,						/* st */
+   },
+   update_samplers					/* update */
+};
diff --git a/mesalib/src/mesa/state_tracker/st_atom_scissor.c b/mesalib/src/mesa/state_tracker/st_atom_scissor.c
index 495a3ea25..eb1387778 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_scissor.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_scissor.c
@@ -1,100 +1,101 @@
-/**************************************************************************

- * 

- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

- * All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- * 

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- * 

- **************************************************************************/

-

- /*

-  * Authors:

-  *   Keith Whitwell <keith@tungstengraphics.com>

-  */

- 

-

-#include "main/macros.h"

-#include "st_context.h"

-#include "pipe/p_context.h"

-#include "st_atom.h"

-

-

-/**

- * Scissor depends on the scissor box, and the framebuffer dimensions.

- */

-static void

-update_scissor( struct st_context *st )

-{

-   struct pipe_scissor_state scissor;

-   const struct gl_framebuffer *fb = st->ctx->DrawBuffer;

-   GLint miny, maxy;

-

-   scissor.minx = 0;

-   scissor.miny = 0;

-   scissor.maxx = fb->Width;

-   scissor.maxy = fb->Height;

-

-   if (st->ctx->Scissor.Enabled) {

-      /* need to be careful here with xmax or ymax < 0 */

-      GLint xmax = MAX2(0, st->ctx->Scissor.X + st->ctx->Scissor.Width);

-      GLint ymax = MAX2(0, st->ctx->Scissor.Y + st->ctx->Scissor.Height);

-

-      if (st->ctx->Scissor.X > (GLint)scissor.minx)

-         scissor.minx = st->ctx->Scissor.X;

-      if (st->ctx->Scissor.Y > (GLint)scissor.miny)

-         scissor.miny = st->ctx->Scissor.Y;

-

-      if (xmax < (GLint) scissor.maxx)

-         scissor.maxx = xmax;

-      if (ymax < (GLint) scissor.maxy)

-         scissor.maxy = ymax;

-

-      /* check for null space */

-      if (scissor.minx >= scissor.maxx || scissor.miny >= scissor.maxy)

-         scissor.minx = scissor.miny = scissor.maxx = scissor.maxy = 0;

-   }

-

-   /* Now invert Y if needed.

-    * Gallium drivers use the convention Y=0=top for surfaces.

-    */

-   if (st_fb_orientation(fb) == Y_0_TOP) {

-      miny = fb->Height - scissor.maxy;

-      maxy = fb->Height - scissor.miny;

-      scissor.miny = miny;

-      scissor.maxy = maxy;

-   }

-

-   if (memcmp(&scissor, &st->state.scissor, sizeof(scissor)) != 0) {

-      /* state has changed */

-      st->state.scissor = scissor;  /* struct copy */

-      st->pipe->set_scissor_state(st->pipe, &scissor); /* activate */

-   }

-}

-

-

-const struct st_tracked_state st_update_scissor = {

-   "st_update_scissor",					/* name */

-   {							/* dirty */

-      (_NEW_SCISSOR | _NEW_BUFFERS),			/* mesa */

-      0,						/* st */

-   },

-   update_scissor					/* update */

-};

+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+ /*
+  * Authors:
+  *   Keith Whitwell <keith@tungstengraphics.com>
+  */
+ 
+
+#include "main/macros.h"
+#include "st_context.h"
+#include "pipe/p_context.h"
+#include "st_atom.h"
+
+
+/**
+ * Scissor depends on the scissor box, and the framebuffer dimensions.
+ */
+static void
+update_scissor( struct st_context *st )
+{
+   struct pipe_scissor_state scissor;
+   const struct gl_context *ctx = st->ctx;
+   const struct gl_framebuffer *fb = ctx->DrawBuffer;
+   GLint miny, maxy;
+
+   scissor.minx = 0;
+   scissor.miny = 0;
+   scissor.maxx = fb->Width;
+   scissor.maxy = fb->Height;
+
+   if (ctx->Scissor.Enabled) {
+      /* need to be careful here with xmax or ymax < 0 */
+      GLint xmax = MAX2(0, ctx->Scissor.X + ctx->Scissor.Width);
+      GLint ymax = MAX2(0, ctx->Scissor.Y + ctx->Scissor.Height);
+
+      if (ctx->Scissor.X > (GLint)scissor.minx)
+         scissor.minx = ctx->Scissor.X;
+      if (ctx->Scissor.Y > (GLint)scissor.miny)
+         scissor.miny = ctx->Scissor.Y;
+
+      if (xmax < (GLint) scissor.maxx)
+         scissor.maxx = xmax;
+      if (ymax < (GLint) scissor.maxy)
+         scissor.maxy = ymax;
+
+      /* check for null space */
+      if (scissor.minx >= scissor.maxx || scissor.miny >= scissor.maxy)
+         scissor.minx = scissor.miny = scissor.maxx = scissor.maxy = 0;
+   }
+
+   /* Now invert Y if needed.
+    * Gallium drivers use the convention Y=0=top for surfaces.
+    */
+   if (st_fb_orientation(fb) == Y_0_TOP) {
+      miny = fb->Height - scissor.maxy;
+      maxy = fb->Height - scissor.miny;
+      scissor.miny = miny;
+      scissor.maxy = maxy;
+   }
+
+   if (memcmp(&scissor, &st->state.scissor, sizeof(scissor)) != 0) {
+      /* state has changed */
+      st->state.scissor = scissor;  /* struct copy */
+      st->pipe->set_scissor_state(st->pipe, &scissor); /* activate */
+   }
+}
+
+
+const struct st_tracked_state st_update_scissor = {
+   "st_update_scissor",					/* name */
+   {							/* dirty */
+      (_NEW_SCISSOR | _NEW_BUFFERS),			/* mesa */
+      0,						/* st */
+   },
+   update_scissor					/* update */
+};
diff --git a/mesalib/src/mesa/state_tracker/st_atom_stipple.c b/mesalib/src/mesa/state_tracker/st_atom_stipple.c
index 5efea315c..b3e0dc7f1 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_stipple.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_stipple.c
@@ -1,93 +1,94 @@
-/**************************************************************************

- * 

- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

- * All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- * 

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- * 

- **************************************************************************/

-

- /*

-  * \brief polygon stipple state

-  *

-  * Authors:

-  *   Brian Paul

-  */

- 

-

-#include <assert.h>

-

-#include "st_context.h"

-#include "st_atom.h"

-#include "pipe/p_context.h"

-#include "pipe/p_defines.h"

-

-

-/**

- * OpenGL's polygon stipple is indexed with window coordinates in which

- * the origin (0,0) is the lower-left corner of the window.

- * With Gallium, the origin is the upper-left corner of the window.

- * To convert GL's polygon stipple to what gallium expects we need to

- * invert the pattern vertically and rotate the stipple rows according

- * to the window height.

- */

-static void

-invert_stipple(GLuint dest[32], const GLuint src[32], GLuint winHeight)

-{

-   GLuint i;

-

-   for (i = 0; i < 32; i++) {

-      dest[i] = src[(winHeight - 1 - i) & 0x1f];

-   }

-}

-

-

-

-static void 

-update_stipple( struct st_context *st )

-{

-   const GLuint sz = sizeof(st->state.poly_stipple);

-   assert(sz == sizeof(st->ctx->PolygonStipple));

-

-   if (memcmp(st->state.poly_stipple, st->ctx->PolygonStipple, sz)) {

-      /* state has changed */

-      struct pipe_poly_stipple newStipple;

-

-      memcpy(st->state.poly_stipple, st->ctx->PolygonStipple, sz);

-

-      invert_stipple(newStipple.stipple, st->ctx->PolygonStipple,

-                     st->ctx->DrawBuffer->Height);

-

-      st->pipe->set_polygon_stipple(st->pipe, &newStipple);

-   }

-}

-

-

-/** Update the stipple when the pattern or window height changes */

-const struct st_tracked_state st_update_polygon_stipple = {

-   "st_update_polygon_stipple",				/* name */

-   {							/* dirty */

-      (_NEW_POLYGONSTIPPLE |

-       _NEW_BUFFERS),					/* mesa */

-      0,						/* st */

-   },

-   update_stipple					/* update */

-};

+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+ /*
+  * \brief polygon stipple state
+  *
+  * Authors:
+  *   Brian Paul
+  */
+ 
+
+#include <assert.h>
+
+#include "st_context.h"
+#include "st_atom.h"
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
+
+
+/**
+ * OpenGL's polygon stipple is indexed with window coordinates in which
+ * the origin (0,0) is the lower-left corner of the window.
+ * With Gallium, the origin is the upper-left corner of the window.
+ * To convert GL's polygon stipple to what gallium expects we need to
+ * invert the pattern vertically and rotate the stipple rows according
+ * to the window height.
+ */
+static void
+invert_stipple(GLuint dest[32], const GLuint src[32], GLuint winHeight)
+{
+   GLuint i;
+
+   for (i = 0; i < 32; i++) {
+      dest[i] = src[(winHeight - 1 - i) & 0x1f];
+   }
+}
+
+
+
+static void 
+update_stipple( struct st_context *st )
+{
+   const struct gl_context *ctx = st->ctx;
+   const GLuint sz = sizeof(st->state.poly_stipple);
+   assert(sz == sizeof(ctx->PolygonStipple));
+
+   if (memcmp(st->state.poly_stipple, ctx->PolygonStipple, sz)) {
+      /* state has changed */
+      struct pipe_poly_stipple newStipple;
+
+      memcpy(st->state.poly_stipple, ctx->PolygonStipple, sz);
+
+      invert_stipple(newStipple.stipple, ctx->PolygonStipple,
+                     ctx->DrawBuffer->Height);
+
+      st->pipe->set_polygon_stipple(st->pipe, &newStipple);
+   }
+}
+
+
+/** Update the stipple when the pattern or window height changes */
+const struct st_tracked_state st_update_polygon_stipple = {
+   "st_update_polygon_stipple",				/* name */
+   {							/* dirty */
+      (_NEW_POLYGONSTIPPLE |
+       _NEW_BUFFERS),					/* mesa */
+      0,						/* st */
+   },
+   update_stipple					/* update */
+};
diff --git a/mesalib/src/mesa/state_tracker/st_atom_texture.c b/mesalib/src/mesa/state_tracker/st_atom_texture.c
index 7bb950a76..800a9f1f0 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_texture.c
@@ -1,379 +1,383 @@
-/**************************************************************************

- * 

- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

- * All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- * 

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- * 

- **************************************************************************/

-

- /*

-  * Authors:

-  *   Keith Whitwell <keith@tungstengraphics.com>

-  *   Brian Paul

-  */

- 

-

-#include "main/macros.h"

-#include "main/mtypes.h"

-#include "main/samplerobj.h"

-#include "program/prog_instruction.h"

-

-#include "st_context.h"

-#include "st_atom.h"

-#include "st_texture.h"

-#include "st_format.h"

-#include "st_cb_texture.h"

-#include "pipe/p_context.h"

-#include "util/u_format.h"

-#include "util/u_inlines.h"

-#include "cso_cache/cso_context.h"

-

-

-/**

- * Combine depth texture mode with "swizzle" so that depth mode swizzling

- * takes place before texture swizzling, and return the resulting swizzle.

- * If the format is not a depth format, return "swizzle" unchanged.

- *

- * \param format     PIPE_FORMAT_*.

- * \param swizzle    Texture swizzle, a bitmask computed using MAKE_SWIZZLE4.

- * \param depthmode  One of GL_LUMINANCE, GL_INTENSITY, GL_ALPHA, GL_RED.

- */

-static GLuint

-apply_depthmode(enum pipe_format format, GLuint swizzle, GLenum depthmode)

-{

-   const struct util_format_description *desc =

-         util_format_description(format);

-   unsigned char swiz[4];

-   unsigned i;

-

-   if (desc->colorspace != UTIL_FORMAT_COLORSPACE_ZS ||

-       desc->swizzle[0] == UTIL_FORMAT_SWIZZLE_NONE) {

-      /* Not a depth format. */

-      return swizzle;

-   }

-

-   for (i = 0; i < 4; i++)

-      swiz[i] = GET_SWZ(swizzle, i);

-

-   switch (depthmode) {

-      case GL_LUMINANCE:

-         /* Rewrite reads from W to ONE, and reads from XYZ to XXX. */

-         for (i = 0; i < 4; i++)

-            if (swiz[i] == SWIZZLE_W)

-               swiz[i] = SWIZZLE_ONE;

-            else if (swiz[i] < SWIZZLE_W)

-               swiz[i] = SWIZZLE_X;

-         break;

-

-      case GL_INTENSITY:

-         /* Rewrite reads from XYZW to XXXX. */

-         for (i = 0; i < 4; i++)

-            if (swiz[i] <= SWIZZLE_W)

-               swiz[i] = SWIZZLE_X;

-         break;

-

-      case GL_ALPHA:

-         /* Rewrite reads from W to X, and reads from XYZ to 000. */

-         for (i = 0; i < 4; i++)

-            if (swiz[i] == SWIZZLE_W)

-               swiz[i] = SWIZZLE_X;

-            else if (swiz[i] < SWIZZLE_W)

-               swiz[i] = SWIZZLE_ZERO;

-         break;

-      case GL_RED:

-	 /* Rewrite reads W to 1, XYZ to X00 */

-	 for (i = 0; i < 4; i++)

-	    if (swiz[i] == SWIZZLE_W)

-	       swiz[i] = SWIZZLE_ONE;

-	    else if (swiz[i] == SWIZZLE_Y || swiz[i] == SWIZZLE_Z)

-	       swiz[i] = SWIZZLE_ZERO;

-	 break;

-   }

-

-   return MAKE_SWIZZLE4(swiz[0], swiz[1], swiz[2], swiz[3]);

-}

-

-

-/**

- * Return TRUE if the swizzling described by "swizzle" and

- * "depthmode" (for depth textures only) is different from the swizzling

- * set in the given sampler view.

- *

- * \param sv         A sampler view.

- * \param swizzle    Texture swizzle, a bitmask computed using MAKE_SWIZZLE4.

- * \param depthmode  One of GL_LUMINANCE, GL_INTENSITY, GL_ALPHA.

- */

-static boolean

-check_sampler_swizzle(struct pipe_sampler_view *sv,

-                      GLuint swizzle, GLenum depthmode)

-{

-   swizzle = apply_depthmode(sv->texture->format, swizzle, depthmode);

-

-   if ((sv->swizzle_r != GET_SWZ(swizzle, 0)) ||

-       (sv->swizzle_g != GET_SWZ(swizzle, 1)) ||

-       (sv->swizzle_b != GET_SWZ(swizzle, 2)) ||

-       (sv->swizzle_a != GET_SWZ(swizzle, 3)))

-      return TRUE;

-   return FALSE;

-}

-

-

-static INLINE struct pipe_sampler_view *

-st_create_texture_sampler_view_from_stobj(struct pipe_context *pipe,

-					  struct st_texture_object *stObj,

-                                          const struct gl_sampler_object *samp,

-					  enum pipe_format format)

-{

-   struct pipe_sampler_view templ;

-   GLuint swizzle = apply_depthmode(stObj->pt->format,

-                                    stObj->base._Swizzle,

-                                    samp->DepthMode);

-

-   u_sampler_view_default_template(&templ,

-                                   stObj->pt,

-                                   format);

-   templ.u.tex.first_level = stObj->base.BaseLevel;

-

-   if (swizzle != SWIZZLE_NOOP) {

-      templ.swizzle_r = GET_SWZ(swizzle, 0);

-      templ.swizzle_g = GET_SWZ(swizzle, 1);

-      templ.swizzle_b = GET_SWZ(swizzle, 2);

-      templ.swizzle_a = GET_SWZ(swizzle, 3);

-   }

-

-   return pipe->create_sampler_view(pipe, stObj->pt, &templ);

-}

-

-

-static INLINE struct pipe_sampler_view *

-st_get_texture_sampler_view_from_stobj(struct st_texture_object *stObj,

-				       struct pipe_context *pipe,

-                                       const struct gl_sampler_object *samp,

-				       enum pipe_format format)

-{

-   if (!stObj || !stObj->pt) {

-      return NULL;

-   }

-

-   if (!stObj->sampler_view) {

-      stObj->sampler_view =

-         st_create_texture_sampler_view_from_stobj(pipe, stObj, samp, format);

-   }

-

-   return stObj->sampler_view;

-}

-

-static GLboolean

-update_single_texture(struct st_context *st, struct pipe_sampler_view **sampler_view,

-		      GLuint texUnit)

-{

-   struct pipe_context *pipe = st->pipe;

-   const struct gl_sampler_object *samp;

-   struct gl_texture_object *texObj;

-   struct st_texture_object *stObj;

-   enum pipe_format st_view_format;

-   GLboolean retval;

-

-   samp = _mesa_get_samplerobj(st->ctx, texUnit);

-

-   texObj = st->ctx->Texture.Unit[texUnit]._Current;

-

-   if (!texObj) {

-      texObj = st_get_default_texture(st);

-      samp = &texObj->Sampler;

-   }

-   stObj = st_texture_object(texObj);

-

-   retval = st_finalize_texture(st->ctx, st->pipe, texObj);

-   if (!retval) {

-      /* out of mem */

-      return GL_FALSE;

-   }

-

-   /* Determine the format of the texture sampler view */

-   st_view_format = stObj->pt->format;

-   {

-      const struct st_texture_image *firstImage =

-	 st_texture_image(stObj->base.Image[0][stObj->base.BaseLevel]);

-      const gl_format texFormat = firstImage->base.TexFormat;

-      enum pipe_format firstImageFormat =

-	 st_mesa_format_to_pipe_format(texFormat);

-

-      if ((samp->sRGBDecode == GL_SKIP_DECODE_EXT) &&

-	  (_mesa_get_format_color_encoding(texFormat) == GL_SRGB)) {

-	 /* don't do sRGB->RGB conversion.  Interpret the texture

-	  * texture data as linear values.

-	  */

-	 const gl_format linearFormat =

-	    _mesa_get_srgb_format_linear(texFormat);

-	 firstImageFormat = st_mesa_format_to_pipe_format(linearFormat);

-      }

-

-      if (firstImageFormat != stObj->pt->format)

-	 st_view_format = firstImageFormat;

-   }

-

-

-   /* if sampler view has changed dereference it */

-   if (stObj->sampler_view) {

-      if (check_sampler_swizzle(stObj->sampler_view,

-				stObj->base._Swizzle,

-				samp->DepthMode) ||

-	  (st_view_format != stObj->sampler_view->format) ||

-	  stObj->base.BaseLevel != stObj->sampler_view->u.tex.first_level) {

-	 pipe_sampler_view_reference(&stObj->sampler_view, NULL);

-      }

-   }

-

-   *sampler_view = st_get_texture_sampler_view_from_stobj(stObj, pipe,

-							  samp,

-							  st_view_format);

-   return GL_TRUE;

-}

-

-static void 

-update_vertex_textures(struct st_context *st)

-{

-   struct gl_vertex_program *vprog = st->ctx->VertexProgram._Current;

-   GLuint su;

-

-   st->state.num_vertex_textures = 0;

-

-   /* loop over sampler units (aka tex image units) */

-   for (su = 0; su < st->ctx->Const.MaxTextureImageUnits; su++) {

-      struct pipe_sampler_view *sampler_view = NULL;

-      if (vprog->Base.SamplersUsed & (1 << su)) {

-         GLboolean retval;

-         GLuint texUnit;

-

-	 texUnit = vprog->Base.SamplerUnits[su];

-

-	 retval = update_single_texture(st, &sampler_view, texUnit);

-	 if (retval == GL_FALSE)

-	    continue;

-

-	 st->state.num_vertex_textures = su + 1;

-

-      }

-      pipe_sampler_view_reference(&st->state.sampler_vertex_views[su], sampler_view);

-   }

-

-   if (st->ctx->Const.MaxVertexTextureImageUnits > 0) {

-      GLuint numUnits = MIN2(st->state.num_vertex_textures,

-                             st->ctx->Const.MaxVertexTextureImageUnits);

-      cso_set_vertex_sampler_views(st->cso_context,

-                                   numUnits,

-                                   st->state.sampler_vertex_views);

-   }

-}

-

-static void 

-update_fragment_textures(struct st_context *st)

-{

-   struct gl_fragment_program *fprog = st->ctx->FragmentProgram._Current;

-   GLuint su;

-

-   st->state.num_textures = 0;

-

-   /* loop over sampler units (aka tex image units) */

-   for (su = 0; su < st->ctx->Const.MaxTextureImageUnits; su++) {

-      struct pipe_sampler_view *sampler_view = NULL;

-      if (fprog->Base.SamplersUsed & (1 << su)) {

-         GLboolean retval;

-         GLuint texUnit;

-

-	 texUnit = fprog->Base.SamplerUnits[su];

-

-	 retval = update_single_texture(st, &sampler_view, texUnit);

-	 if (retval == GL_FALSE)

-	    continue;

-

-         st->state.num_textures = su + 1;

-      }

-      pipe_sampler_view_reference(&st->state.sampler_views[su], sampler_view);

-   }

-

-   cso_set_fragment_sampler_views(st->cso_context,

-                                  st->state.num_textures,

-                                  st->state.sampler_views);

-}

-

-const struct st_tracked_state st_update_texture = {

-   "st_update_texture",					/* name */

-   {							/* dirty */

-      _NEW_TEXTURE,					/* mesa */

-      ST_NEW_FRAGMENT_PROGRAM,				/* st */

-   },

-   update_fragment_textures				/* update */

-};

-

-const struct st_tracked_state st_update_vertex_texture = {

-   "st_update_vertex_texture",					/* name */

-   {							/* dirty */

-      _NEW_TEXTURE,					/* mesa */

-      ST_NEW_VERTEX_PROGRAM,				/* st */

-   },

-   update_vertex_textures				/* update */

-};

-

-static void 

-finalize_textures(struct st_context *st)

-{

-   struct gl_fragment_program *fprog = st->ctx->FragmentProgram._Current;

-   const GLboolean prev_missing_textures = st->missing_textures;

-   GLuint su;

-

-   st->missing_textures = GL_FALSE;

-

-   for (su = 0; su < st->ctx->Const.MaxTextureCoordUnits; su++) {

-      if (fprog->Base.SamplersUsed & (1 << su)) {

-         const GLuint texUnit = fprog->Base.SamplerUnits[su];

-         struct gl_texture_object *texObj

-            = st->ctx->Texture.Unit[texUnit]._Current;

-

-         if (texObj) {

-            GLboolean retval;

-

-            retval = st_finalize_texture(st->ctx, st->pipe, texObj);

-            if (!retval) {

-               /* out of mem */

-               st->missing_textures = GL_TRUE;

-               continue;

-            }

-         }

-      }

-   }

-

-   if (prev_missing_textures != st->missing_textures)

-      st->dirty.st |= ST_NEW_FRAGMENT_PROGRAM;

-}

-

-

-

-const struct st_tracked_state st_finalize_textures = {

-   "st_finalize_textures",		/* name */

-   {					/* dirty */

-      _NEW_TEXTURE,			/* mesa */

-      0,				/* st */

-   },

-   finalize_textures			/* update */

-};

+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+ /*
+  * Authors:
+  *   Keith Whitwell <keith@tungstengraphics.com>
+  *   Brian Paul
+  */
+ 
+
+#include "main/macros.h"
+#include "main/mtypes.h"
+#include "main/samplerobj.h"
+#include "program/prog_instruction.h"
+
+#include "st_context.h"
+#include "st_atom.h"
+#include "st_texture.h"
+#include "st_format.h"
+#include "st_cb_texture.h"
+#include "pipe/p_context.h"
+#include "util/u_format.h"
+#include "util/u_inlines.h"
+#include "cso_cache/cso_context.h"
+
+
+/**
+ * Combine depth texture mode with "swizzle" so that depth mode swizzling
+ * takes place before texture swizzling, and return the resulting swizzle.
+ * If the format is not a depth format, return "swizzle" unchanged.
+ *
+ * \param format     PIPE_FORMAT_*.
+ * \param swizzle    Texture swizzle, a bitmask computed using MAKE_SWIZZLE4.
+ * \param depthmode  One of GL_LUMINANCE, GL_INTENSITY, GL_ALPHA, GL_RED.
+ */
+static GLuint
+apply_depthmode(enum pipe_format format, GLuint swizzle, GLenum depthmode)
+{
+   const struct util_format_description *desc =
+         util_format_description(format);
+   unsigned char swiz[4];
+   unsigned i;
+
+   if (desc->colorspace != UTIL_FORMAT_COLORSPACE_ZS ||
+       desc->swizzle[0] == UTIL_FORMAT_SWIZZLE_NONE) {
+      /* Not a depth format. */
+      return swizzle;
+   }
+
+   for (i = 0; i < 4; i++)
+      swiz[i] = GET_SWZ(swizzle, i);
+
+   switch (depthmode) {
+      case GL_LUMINANCE:
+         /* Rewrite reads from W to ONE, and reads from XYZ to XXX. */
+         for (i = 0; i < 4; i++)
+            if (swiz[i] == SWIZZLE_W)
+               swiz[i] = SWIZZLE_ONE;
+            else if (swiz[i] < SWIZZLE_W)
+               swiz[i] = SWIZZLE_X;
+         break;
+
+      case GL_INTENSITY:
+         /* Rewrite reads from XYZW to XXXX. */
+         for (i = 0; i < 4; i++)
+            if (swiz[i] <= SWIZZLE_W)
+               swiz[i] = SWIZZLE_X;
+         break;
+
+      case GL_ALPHA:
+         /* Rewrite reads from W to X, and reads from XYZ to 000. */
+         for (i = 0; i < 4; i++)
+            if (swiz[i] == SWIZZLE_W)
+               swiz[i] = SWIZZLE_X;
+            else if (swiz[i] < SWIZZLE_W)
+               swiz[i] = SWIZZLE_ZERO;
+         break;
+      case GL_RED:
+	 /* Rewrite reads W to 1, XYZ to X00 */
+	 for (i = 0; i < 4; i++)
+	    if (swiz[i] == SWIZZLE_W)
+	       swiz[i] = SWIZZLE_ONE;
+	    else if (swiz[i] == SWIZZLE_Y || swiz[i] == SWIZZLE_Z)
+	       swiz[i] = SWIZZLE_ZERO;
+	 break;
+   }
+
+   return MAKE_SWIZZLE4(swiz[0], swiz[1], swiz[2], swiz[3]);
+}
+
+
+/**
+ * Return TRUE if the swizzling described by "swizzle" and
+ * "depthmode" (for depth textures only) is different from the swizzling
+ * set in the given sampler view.
+ *
+ * \param sv         A sampler view.
+ * \param swizzle    Texture swizzle, a bitmask computed using MAKE_SWIZZLE4.
+ * \param depthmode  One of GL_LUMINANCE, GL_INTENSITY, GL_ALPHA.
+ */
+static boolean
+check_sampler_swizzle(struct pipe_sampler_view *sv,
+                      GLuint swizzle, GLenum depthmode)
+{
+   swizzle = apply_depthmode(sv->texture->format, swizzle, depthmode);
+
+   if ((sv->swizzle_r != GET_SWZ(swizzle, 0)) ||
+       (sv->swizzle_g != GET_SWZ(swizzle, 1)) ||
+       (sv->swizzle_b != GET_SWZ(swizzle, 2)) ||
+       (sv->swizzle_a != GET_SWZ(swizzle, 3)))
+      return TRUE;
+   return FALSE;
+}
+
+
+static INLINE struct pipe_sampler_view *
+st_create_texture_sampler_view_from_stobj(struct pipe_context *pipe,
+					  struct st_texture_object *stObj,
+                                          const struct gl_sampler_object *samp,
+					  enum pipe_format format)
+{
+   struct pipe_sampler_view templ;
+   GLuint swizzle = apply_depthmode(stObj->pt->format,
+                                    stObj->base._Swizzle,
+                                    samp->DepthMode);
+
+   u_sampler_view_default_template(&templ,
+                                   stObj->pt,
+                                   format);
+   templ.u.tex.first_level = stObj->base.BaseLevel;
+
+   if (swizzle != SWIZZLE_NOOP) {
+      templ.swizzle_r = GET_SWZ(swizzle, 0);
+      templ.swizzle_g = GET_SWZ(swizzle, 1);
+      templ.swizzle_b = GET_SWZ(swizzle, 2);
+      templ.swizzle_a = GET_SWZ(swizzle, 3);
+   }
+
+   return pipe->create_sampler_view(pipe, stObj->pt, &templ);
+}
+
+
+static INLINE struct pipe_sampler_view *
+st_get_texture_sampler_view_from_stobj(struct st_texture_object *stObj,
+				       struct pipe_context *pipe,
+                                       const struct gl_sampler_object *samp,
+				       enum pipe_format format)
+{
+   if (!stObj || !stObj->pt) {
+      return NULL;
+   }
+
+   if (!stObj->sampler_view) {
+      stObj->sampler_view =
+         st_create_texture_sampler_view_from_stobj(pipe, stObj, samp, format);
+   }
+
+   return stObj->sampler_view;
+}
+
+static GLboolean
+update_single_texture(struct st_context *st, struct pipe_sampler_view **sampler_view,
+		      GLuint texUnit)
+{
+   struct pipe_context *pipe = st->pipe;
+   struct gl_context *ctx = st->ctx;
+   const struct gl_sampler_object *samp;
+   struct gl_texture_object *texObj;
+   struct st_texture_object *stObj;
+   enum pipe_format st_view_format;
+   GLboolean retval;
+
+   samp = _mesa_get_samplerobj(ctx, texUnit);
+
+   texObj = ctx->Texture.Unit[texUnit]._Current;
+
+   if (!texObj) {
+      texObj = st_get_default_texture(st);
+      samp = &texObj->Sampler;
+   }
+   stObj = st_texture_object(texObj);
+
+   retval = st_finalize_texture(ctx, st->pipe, texObj);
+   if (!retval) {
+      /* out of mem */
+      return GL_FALSE;
+   }
+
+   /* Determine the format of the texture sampler view */
+   st_view_format = stObj->pt->format;
+   {
+      const struct st_texture_image *firstImage =
+	 st_texture_image(stObj->base.Image[0][stObj->base.BaseLevel]);
+      const gl_format texFormat = firstImage->base.TexFormat;
+      enum pipe_format firstImageFormat =
+	 st_mesa_format_to_pipe_format(texFormat);
+
+      if ((samp->sRGBDecode == GL_SKIP_DECODE_EXT) &&
+	  (_mesa_get_format_color_encoding(texFormat) == GL_SRGB)) {
+	 /* don't do sRGB->RGB conversion.  Interpret the texture
+	  * texture data as linear values.
+	  */
+	 const gl_format linearFormat =
+	    _mesa_get_srgb_format_linear(texFormat);
+	 firstImageFormat = st_mesa_format_to_pipe_format(linearFormat);
+      }
+
+      if (firstImageFormat != stObj->pt->format)
+	 st_view_format = firstImageFormat;
+   }
+
+
+   /* if sampler view has changed dereference it */
+   if (stObj->sampler_view) {
+      if (check_sampler_swizzle(stObj->sampler_view,
+				stObj->base._Swizzle,
+				samp->DepthMode) ||
+	  (st_view_format != stObj->sampler_view->format) ||
+	  stObj->base.BaseLevel != stObj->sampler_view->u.tex.first_level) {
+	 pipe_sampler_view_reference(&stObj->sampler_view, NULL);
+      }
+   }
+
+   *sampler_view = st_get_texture_sampler_view_from_stobj(stObj, pipe,
+							  samp,
+							  st_view_format);
+   return GL_TRUE;
+}
+
+static void 
+update_vertex_textures(struct st_context *st)
+{
+   const struct gl_context *ctx = st->ctx;
+   struct gl_vertex_program *vprog = ctx->VertexProgram._Current;
+   GLuint su;
+
+   st->state.num_vertex_textures = 0;
+
+   /* loop over sampler units (aka tex image units) */
+   for (su = 0; su < ctx->Const.MaxTextureImageUnits; su++) {
+      struct pipe_sampler_view *sampler_view = NULL;
+      if (vprog->Base.SamplersUsed & (1 << su)) {
+         GLboolean retval;
+         GLuint texUnit;
+
+	 texUnit = vprog->Base.SamplerUnits[su];
+
+	 retval = update_single_texture(st, &sampler_view, texUnit);
+	 if (retval == GL_FALSE)
+	    continue;
+
+	 st->state.num_vertex_textures = su + 1;
+
+      }
+      pipe_sampler_view_reference(&st->state.sampler_vertex_views[su], sampler_view);
+   }
+
+   if (ctx->Const.MaxVertexTextureImageUnits > 0) {
+      GLuint numUnits = MIN2(st->state.num_vertex_textures,
+                             ctx->Const.MaxVertexTextureImageUnits);
+      cso_set_vertex_sampler_views(st->cso_context,
+                                   numUnits,
+                                   st->state.sampler_vertex_views);
+   }
+}
+
+static void 
+update_fragment_textures(struct st_context *st)
+{
+   const struct gl_context *ctx = st->ctx;
+   struct gl_fragment_program *fprog = ctx->FragmentProgram._Current;
+   GLuint su;
+
+   st->state.num_textures = 0;
+
+   /* loop over sampler units (aka tex image units) */
+   for (su = 0; su < ctx->Const.MaxTextureImageUnits; su++) {
+      struct pipe_sampler_view *sampler_view = NULL;
+      if (fprog->Base.SamplersUsed & (1 << su)) {
+         GLboolean retval;
+         GLuint texUnit;
+
+	 texUnit = fprog->Base.SamplerUnits[su];
+
+	 retval = update_single_texture(st, &sampler_view, texUnit);
+	 if (retval == GL_FALSE)
+	    continue;
+
+         st->state.num_textures = su + 1;
+      }
+      pipe_sampler_view_reference(&st->state.sampler_views[su], sampler_view);
+   }
+
+   cso_set_fragment_sampler_views(st->cso_context,
+                                  st->state.num_textures,
+                                  st->state.sampler_views);
+}
+
+const struct st_tracked_state st_update_texture = {
+   "st_update_texture",					/* name */
+   {							/* dirty */
+      _NEW_TEXTURE,					/* mesa */
+      ST_NEW_FRAGMENT_PROGRAM,				/* st */
+   },
+   update_fragment_textures				/* update */
+};
+
+const struct st_tracked_state st_update_vertex_texture = {
+   "st_update_vertex_texture",					/* name */
+   {							/* dirty */
+      _NEW_TEXTURE,					/* mesa */
+      ST_NEW_VERTEX_PROGRAM,				/* st */
+   },
+   update_vertex_textures				/* update */
+};
+
+static void 
+finalize_textures(struct st_context *st)
+{
+   struct gl_context *ctx = st->ctx;
+   struct gl_fragment_program *fprog = ctx->FragmentProgram._Current;
+   const GLboolean prev_missing_textures = st->missing_textures;
+   GLuint su;
+
+   st->missing_textures = GL_FALSE;
+
+   for (su = 0; su < ctx->Const.MaxTextureCoordUnits; su++) {
+      if (fprog->Base.SamplersUsed & (1 << su)) {
+         const GLuint texUnit = fprog->Base.SamplerUnits[su];
+         struct gl_texture_object *texObj
+            = ctx->Texture.Unit[texUnit]._Current;
+
+         if (texObj) {
+            GLboolean retval;
+
+            retval = st_finalize_texture(ctx, st->pipe, texObj);
+            if (!retval) {
+               /* out of mem */
+               st->missing_textures = GL_TRUE;
+               continue;
+            }
+         }
+      }
+   }
+
+   if (prev_missing_textures != st->missing_textures)
+      st->dirty.st |= ST_NEW_FRAGMENT_PROGRAM;
+}
+
+
+
+const struct st_tracked_state st_finalize_textures = {
+   "st_finalize_textures",		/* name */
+   {					/* dirty */
+      _NEW_TEXTURE,			/* mesa */
+      0,				/* st */
+   },
+   finalize_textures			/* update */
+};
diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c
index dd26db2f6..fac0ab7a1 100644
--- a/mesalib/src/mesa/state_tracker/st_draw.c
+++ b/mesalib/src/mesa/state_tracker/st_draw.c
@@ -33,7 +33,7 @@
  *
  * We basically convert the VBO's vertex attribute/array information into
  * Gallium vertex state, bind the vertex buffer objects and call
- * pipe->draw_elements(), pipe->draw_range_elements() or pipe->draw_arrays().
+ * pipe->draw_vbo().
  *
  * Authors:
  *   Keith Whitwell <keith@tungstengraphics.com>
@@ -237,7 +237,6 @@ st_pipe_vertex_format(GLenum type, GLuint size, GLenum format,
 /**
  * Examine the active arrays to determine if we have interleaved
  * vertex arrays all living in one VBO, or all living in user space.
- * \param userSpace  returns whether the arrays are in user space.
  */
 static GLboolean
 is_interleaved_arrays(const struct st_vertex_program *vp,
@@ -247,8 +246,8 @@ is_interleaved_arrays(const struct st_vertex_program *vp,
    GLuint attr;
    const struct gl_buffer_object *firstBufObj = NULL;
    GLint firstStride = -1;
-   const GLubyte *client_addr = NULL;
-   GLboolean user_memory = GL_FALSE;
+   const GLubyte *firstPtr = NULL;
+   GLboolean userSpaceBuffer = GL_FALSE;
 
    for (attr = 0; attr < vpv->num_inputs; attr++) {
       const GLuint mesaAttr = vp->index_to_input[attr];
@@ -256,37 +255,26 @@ is_interleaved_arrays(const struct st_vertex_program *vp,
       const struct gl_buffer_object *bufObj = array->BufferObj;
       const GLsizei stride = array->StrideB; /* in bytes */
 
-      if (firstStride < 0) {
+      if (attr == 0) {
+         /* save info about the first array */
          firstStride = stride;
-         user_memory = !bufObj || !bufObj->Name;
-      }
-      else if (firstStride != stride) {
-         return GL_FALSE;
-      }
-
-      if (!bufObj || !bufObj->Name) {
-         /* Try to detect if the client-space arrays are
-          * "close" to each other.
-          */
-         if (!user_memory) {
-            return GL_FALSE;
-         }
-         if (!client_addr) {
-            client_addr = array->Ptr;
-         }
-         else if (abs(array->Ptr - client_addr) > firstStride) {
-            /* arrays start too far apart */
-            return GL_FALSE;
-         }
-      }
-      else if (!firstBufObj) {
-         if (user_memory) {
-            return GL_FALSE;
-         }
+         firstPtr = array->Ptr;         
          firstBufObj = bufObj;
+         userSpaceBuffer = !bufObj || !bufObj->Name;
       }
-      else if (bufObj != firstBufObj) {
-         return GL_FALSE;
+      else {
+         /* check if other arrays interleave with the first, in same buffer */
+         if (stride != firstStride)
+            return GL_FALSE; /* strides don't match */
+
+         if (bufObj != firstBufObj)
+            return GL_FALSE; /* arrays in different VBOs */
+
+         if (abs(array->Ptr - firstPtr) > firstStride)
+            return GL_FALSE; /* arrays start too far apart */
+
+         if ((!bufObj || !_mesa_is_bufferobj(bufObj)) != userSpaceBuffer)
+            return GL_FALSE; /* mix of VBO and user-space arrays */
       }
    }
 
@@ -510,6 +498,7 @@ setup_index_buffer(struct gl_context *ctx,
    }
 }
 
+
 /**
  * Prior to drawing, check that any uniforms referenced by the
  * current shader have been set.  If a uniform has not been set,
@@ -556,8 +545,8 @@ translate_prim(const struct gl_context *ctx, unsigned prim)
    assert(GL_TRIANGLE_STRIP_ADJACENCY == PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY);
 
    /* Avoid quadstrips if it's easy to do so:
-    * Note: it's imporant to do the correct trimming if we change the prim type!
-    * We do that wherever this function is called.
+    * Note: it's important to do the correct trimming if we change the
+    * prim type!  We do that wherever this function is called.
     */
    if (prim == GL_QUAD_STRIP &&
        ctx->Light.ShadeModel != GL_FLAT &&
@@ -739,8 +728,8 @@ st_draw_vbo(struct gl_context *ctx,
       }
    }
 
-   info.primitive_restart = st->ctx->Array.PrimitiveRestart;
-   info.restart_index = st->ctx->Array.RestartIndex;
+   info.primitive_restart = ctx->Array.PrimitiveRestart;
+   info.restart_index = ctx->Array.RestartIndex;
 
    /* do actual drawing */
    for (i = 0; i < nr_prims; i++) {