xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 May 2011

5 files changed, 653 insertions, 649 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_atom.c b/mesalib/src/mesa/state_tracker/st_atom.c
index 34dff79e7..95010d1b2 100644
--- a/mesalib/src/mesa/state_tracker/st_atom.c
+++ b/mesalib/src/mesa/state_tracker/st_atom.c
@@ -56,6 +56,7 @@ static const struct st_tracked_state *atoms[] =
    &st_update_scissor,

    &st_update_blend,

    &st_update_sampler,

+   &st_update_vertex_texture,

    &st_update_texture,

    &st_update_framebuffer,

    &st_update_msaa,

diff --git a/mesalib/src/mesa/state_tracker/st_atom.h b/mesalib/src/mesa/state_tracker/st_atom.h
index aec5785e6..b5f837f78 100644
--- a/mesalib/src/mesa/state_tracker/st_atom.h
+++ b/mesalib/src/mesa/state_tracker/st_atom.h
@@ -60,6 +60,7 @@ extern const struct st_tracked_state st_update_blend;
 extern const struct st_tracked_state st_update_msaa;

 extern const struct st_tracked_state st_update_sampler;

 extern const struct st_tracked_state st_update_texture;

+extern const struct st_tracked_state st_update_vertex_texture;

 extern const struct st_tracked_state st_finalize_textures;

 extern const struct st_tracked_state st_update_fs_constants;

 extern const struct st_tracked_state st_update_gs_constants;

diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
index ccbd54892..627a13387 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_sampler.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
@@ -1,272 +1,271 @@
-/**************************************************************************
- * 
- * 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);
-    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;
-
-      memset(sampler, 0, sizeof(*sampler));
-
-      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;
-
-      memset(sampler, 0, sizeof(*sampler));
-
-      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_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 */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_atom_texture.c b/mesalib/src/mesa/state_tracker/st_atom_texture.c
index 990b50438..7bb950a76 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_texture.c
@@ -1,377 +1,379 @@
-/**************************************************************************
- * 
- * 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);
-}
-
-static void 
-update_textures(struct st_context *st)
-{
-  update_fragment_textures(st);
-  update_vertex_textures(st);
-}
-
-const struct st_tracked_state st_update_texture = {
-   "st_update_texture",					/* name */
-   {							/* dirty */
-      _NEW_TEXTURE,					/* mesa */
-      ST_NEW_FRAGMENT_PROGRAM,				/* st */
-   },
-   update_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;

+   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 */

+};

diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
index 0fc743a87..2e87d202c 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
@@ -90,6 +90,7 @@ st_renderbuffer_alloc_storage(struct gl_context * ctx,
    strb->Base.Format = st_pipe_format_to_mesa_format(format);

    strb->Base._BaseFormat = _mesa_base_fbo_format(ctx, internalFormat);

    strb->Base.DataType = st_format_datatype(format);

+   strb->format = format;

 

    strb->defined = GL_FALSE;  /* undefined contents now */