Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/enable.c
	mesalib/src/mesa/main/ff_fragment_shader.cpp
	mesalib/src/mesa/main/texcompress_rgtc_tmp.h
	mesalib/src/mesa/main/texobj.c
	mesalib/src/mesa/main/texparam.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_print.c
	mesalib/src/mesa/program/prog_statevars.c
	mesalib/src/mesa/program/program.c
	mesalib/src/mesa/program/program_parse.y
	mesalib/src/mesa/program/program_parser.h
	mesalib/src/mesa/program/sampler.cpp
	mesalib/src/mesa/sources.mak
	mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
	mesalib/src/mesa/state_tracker/st_cb_blit.c
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_extensions.c
	mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
	mesalib/src/mesa/state_tracker/st_program.c
	mesalib/src/mesa/state_tracker/st_texture.h
	mesalib/src/mesa/vbo/vbo_exec_array.c
	pixman/pixman/pixman-arm-neon-asm.S
	pixman/pixman/pixman-arm-neon.c

1 files changed, 418 insertions, 398 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_texture.c b/mesalib/src/mesa/state_tracker/st_texture.c
index 22ec1306c..0e857fddc 100644
--- a/mesalib/src/mesa/state_tracker/st_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_texture.c
@@ -1,398 +1,418 @@
-/**************************************************************************

- * 

- * 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.

- * 

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

-

-#include <stdio.h>

-

-#include "st_context.h"

-#include "st_format.h"

-#include "st_texture.h"

-#include "st_cb_fbo.h"

-#include "main/enums.h"

-

-#include "pipe/p_state.h"

-#include "pipe/p_context.h"

-#include "pipe/p_defines.h"

-#include "util/u_inlines.h"

-#include "util/u_format.h"

-#include "util/u_rect.h"

-#include "util/u_math.h"

-

-

-#define DBG if(0) printf

-

-

-/**

- * Allocate a new pipe_resource object

- * width0, height0, depth0 are the dimensions of the level 0 image

- * (the highest resolution).  last_level indicates how many mipmap levels

- * to allocate storage for.  For non-mipmapped textures, this will be zero.

- */

-struct pipe_resource *

-st_texture_create(struct st_context *st,

-                  enum pipe_texture_target target,

-		  enum pipe_format format,

-		  GLuint last_level,

-		  GLuint width0,

-		  GLuint height0,

-		  GLuint depth0,

-                  GLuint layers,

-                  GLuint bind )

-{

-   struct pipe_resource pt, *newtex;

-   struct pipe_screen *screen = st->pipe->screen;

-

-   assert(target < PIPE_MAX_TEXTURE_TYPES);

-   assert(width0 > 0);

-   assert(height0 > 0);

-   assert(depth0 > 0);

-   if (target == PIPE_TEXTURE_CUBE)

-      assert(layers == 6);

-

-   DBG("%s target %s format %s last_level %d\n", __FUNCTION__,

-       _mesa_lookup_enum_by_nr(target),

-       _mesa_lookup_enum_by_nr(format), last_level);

-

-   assert(format);

-   assert(screen->is_format_supported(screen, format, target, 0,

-                                      PIPE_BIND_SAMPLER_VIEW));

-

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

-   pt.target = target;

-   pt.format = format;

-   pt.last_level = last_level;

-   pt.width0 = width0;

-   pt.height0 = height0;

-   pt.depth0 = depth0;

-   pt.array_size = (target == PIPE_TEXTURE_CUBE ? 6 : layers);

-   pt.usage = PIPE_USAGE_DEFAULT;

-   pt.bind = bind;

-   pt.flags = 0;

-

-   newtex = screen->resource_create(screen, &pt);

-

-   assert(!newtex || pipe_is_referenced(&newtex->reference));

-

-   return newtex;

-}

-

-

-/**

- * In OpenGL the number of 1D array texture layers is the "height" and

- * the number of 2D array texture layers is the "depth".  In Gallium the

- * number of layers in an array texture is a separate 'array_size' field.

- * This function converts dimensions from the former to the later.

- */

-void

-st_gl_texture_dims_to_pipe_dims(GLenum texture,

-                                GLuint widthIn,

-                                GLuint heightIn,

-                                GLuint depthIn,

-                                GLuint *widthOut,

-                                GLuint *heightOut,

-                                GLuint *depthOut,

-                                GLuint *layersOut)

-{

-   switch (texture) {

-   case GL_TEXTURE_1D:

-      assert(heightIn == 1);

-      assert(depthIn == 1);

-      *widthOut = widthIn;

-      *heightOut = 1;

-      *depthOut = 1;

-      *layersOut = 1;

-      break;

-   case GL_TEXTURE_1D_ARRAY:

-      assert(depthIn == 1);

-      *widthOut = widthIn;

-      *heightOut = 1;

-      *depthOut = 1;

-      *layersOut = heightIn;

-      break;

-   case GL_TEXTURE_2D:

-   case GL_TEXTURE_RECTANGLE:

-      assert(depthIn == 1);

-      *widthOut = widthIn;

-      *heightOut = heightIn;

-      *depthOut = 1;

-      *layersOut = 1;

-      break;

-   case GL_TEXTURE_CUBE_MAP:

-      assert(depthIn == 1);

-      *widthOut = widthIn;

-      *heightOut = heightIn;

-      *depthOut = 1;

-      *layersOut = 6;

-      break;

-   case GL_TEXTURE_2D_ARRAY:

-      *widthOut = widthIn;

-      *heightOut = heightIn;

-      *depthOut = 1;

-      *layersOut = depthIn;

-      break;

-   default:

-      assert(0 && "Unexpected texture in st_gl_texture_dims_to_pipe_dims()");

-      /* fall-through */

-   case GL_TEXTURE_3D:

-      *widthOut = widthIn;

-      *heightOut = heightIn;

-      *depthOut = depthIn;

-      *layersOut = 1;

-      break;

-   }

-}

-

-

-/**

- * Check if a texture image can be pulled into a unified mipmap texture.

- */

-GLboolean

-st_texture_match_image(const struct pipe_resource *pt,

-                       const struct gl_texture_image *image,

-                       GLuint face, GLuint level)

-{

-   GLuint ptWidth, ptHeight, ptDepth, ptLayers;

-

-   /* Images with borders are never pulled into mipmap textures. 

-    */

-   if (image->Border) 

-      return GL_FALSE;

-

-   /* Check if this image's format matches the established texture's format.

-    */

-   if (st_mesa_format_to_pipe_format(image->TexFormat) != pt->format)

-      return GL_FALSE;

-

-   st_gl_texture_dims_to_pipe_dims(image->TexObject->Target,

-                                   image->Width, image->Height, image->Depth,

-                                   &ptWidth, &ptHeight, &ptDepth, &ptLayers);

-

-   /* Test if this image's size matches what's expected in the

-    * established texture.

-    */

-   if (ptWidth != u_minify(pt->width0, level) ||

-       ptHeight != u_minify(pt->height0, level) ||

-       ptDepth != u_minify(pt->depth0, level) ||

-       ptLayers != pt->array_size)

-      return GL_FALSE;

-

-   return GL_TRUE;

-}

-

-

-/**

- * Map a texture image and return the address for a particular 2D face/slice/

- * layer.  The stImage indicates the cube face and mipmap level.  The slice

- * of the 3D texture is passed in 'zoffset'.

- * \param usage  one of the PIPE_TRANSFER_x values

- * \param x, y, w, h  the region of interest of the 2D image.

- * \return address of mapping or NULL if any error

- */

-GLubyte *

-st_texture_image_map(struct st_context *st, struct st_texture_image *stImage,

-                     GLuint zoffset, enum pipe_transfer_usage usage,

-                     GLuint x, GLuint y, GLuint w, GLuint h)

-{

-   struct pipe_context *pipe = st->pipe;

-   struct pipe_resource *pt = stImage->pt;

-

-   DBG("%s \n", __FUNCTION__);

-

-   stImage->transfer = pipe_get_transfer(st->pipe, pt, stImage->level,

-                                         stImage->face + zoffset,

-                                         usage, x, y, w, h);

-

-   if (stImage->transfer)

-      return pipe_transfer_map(pipe, stImage->transfer);

-   else

-      return NULL;

-}

-

-

-void

-st_texture_image_unmap(struct st_context *st,

-                       struct st_texture_image *stImage)

-{

-   struct pipe_context *pipe = st->pipe;

-

-   DBG("%s\n", __FUNCTION__);

-

-   pipe_transfer_unmap(pipe, stImage->transfer);

-

-   pipe->transfer_destroy(pipe, stImage->transfer);

-}

-

-

-

-/**

- * Upload data to a rectangular sub-region.  Lots of choices how to do this:

- *

- * - memcpy by span to current destination

- * - upload data as new buffer and blit

- *

- * Currently always memcpy.

- */

-static void

-st_surface_data(struct pipe_context *pipe,

-		struct pipe_transfer *dst,

-		unsigned dstx, unsigned dsty,

-		const void *src, unsigned src_stride,

-		unsigned srcx, unsigned srcy, unsigned width, unsigned height)

-{

-   void *map = pipe_transfer_map(pipe, dst);

-

-   assert(dst->resource);

-   util_copy_rect(map,

-                  dst->resource->format,

-                  dst->stride,

-                  dstx, dsty, 

-                  width, height, 

-                  src, src_stride, 

-                  srcx, srcy);

-

-   pipe_transfer_unmap(pipe, dst);

-}

-

-

-/* Upload data for a particular image.

- */

-void

-st_texture_image_data(struct st_context *st,

-                      struct pipe_resource *dst,

-                      GLuint face,

-                      GLuint level,

-                      void *src,

-                      GLuint src_row_stride, GLuint src_image_stride)

-{

-   struct pipe_context *pipe = st->pipe;

-   GLuint i;

-   const GLubyte *srcUB = src;

-   struct pipe_transfer *dst_transfer;

-   GLuint layers;

-

-   if (dst->target == PIPE_TEXTURE_1D_ARRAY ||

-       dst->target == PIPE_TEXTURE_2D_ARRAY)

-      layers = dst->array_size;

-   else

-      layers = u_minify(dst->depth0, level);

-

-   DBG("%s\n", __FUNCTION__);

-

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

-      dst_transfer = pipe_get_transfer(st->pipe, dst, level, face + i,

-                                       PIPE_TRANSFER_WRITE, 0, 0,

-                                       u_minify(dst->width0, level),

-                                       u_minify(dst->height0, level));

-

-      st_surface_data(pipe, dst_transfer,

-		      0, 0,                             /* dstx, dsty */

-		      srcUB,

-		      src_row_stride,

-		      0, 0,                             /* source x, y */

-		      u_minify(dst->width0, level),

-                      u_minify(dst->height0, level));    /* width, height */

-

-      pipe->transfer_destroy(pipe, dst_transfer);

-

-      srcUB += src_image_stride;

-   }

-}

-

-

-/**

- * For debug only: get/print center pixel in the src resource.

- */

-static void

-print_center_pixel(struct pipe_context *pipe, struct pipe_resource *src)

-{

-   struct pipe_transfer *xfer;

-   struct pipe_box region;

-   ubyte *map;

-

-   region.x = src->width0 / 2;

-   region.y = src->height0 / 2;

-   region.z = 0;

-   region.width = 1;

-   region.height = 1;

-   region.depth = 1;

-

-   xfer = pipe->get_transfer(pipe, src, 0, PIPE_TRANSFER_READ, &region);

-   map = pipe->transfer_map(pipe, xfer);

-

-   printf("center pixel: %d %d %d %d\n", map[0], map[1], map[2], map[3]);

-

-   pipe->transfer_unmap(pipe, xfer);

-   pipe->transfer_destroy(pipe, xfer);

-}

-

-

-/**

- * Copy the image at level=0 in 'src' to the 'dst' resource at 'dstLevel'.

- * This is used to copy mipmap images from one texture buffer to another.

- * This typically happens when our initial guess at the total texture size

- * is incorrect (see the guess_and_alloc_texture() function).

- */

-void

-st_texture_image_copy(struct pipe_context *pipe,

-                      struct pipe_resource *dst, GLuint dstLevel,

-                      struct pipe_resource *src, GLuint srcLevel,

-                      GLuint face)

-{

-   GLuint width = u_minify(dst->width0, dstLevel);

-   GLuint height = u_minify(dst->height0, dstLevel);

-   GLuint depth = u_minify(dst->depth0, dstLevel);

-   struct pipe_box src_box;

-   GLuint i;

-

-   assert(u_minify(src->width0, srcLevel) == width);

-   assert(u_minify(src->height0, srcLevel) == height);

-   assert(u_minify(src->depth0, srcLevel) == depth);

-

-   src_box.x = 0;

-   src_box.y = 0;

-   src_box.width = width;

-   src_box.height = height;

-   src_box.depth = 1;

-   /* Loop over 3D image slices */

-   /* could (and probably should) use "true" 3d box here -

-      but drivers can't quite handle it yet */

-   for (i = face; i < face + depth; i++) {

-      src_box.z = i;

-

-      if (0)  {

-         print_center_pixel(pipe, src);

-      }

-

-      pipe->resource_copy_region(pipe,

-                                 dst,

-                                 dstLevel,

-                                 0, 0, i,/* destX, Y, Z */

-                                 src,

-                                 srcLevel,

-                                 &src_box);

-   }

-}

-

+/**************************************************************************
+ * 
+ * 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.
+ * 
+ **************************************************************************/
+
+#include <stdio.h>
+
+#include "st_context.h"
+#include "st_format.h"
+#include "st_texture.h"
+#include "st_cb_fbo.h"
+#include "main/enums.h"
+
+#include "pipe/p_state.h"
+#include "pipe/p_context.h"
+#include "pipe/p_defines.h"
+#include "util/u_inlines.h"
+#include "util/u_format.h"
+#include "util/u_rect.h"
+#include "util/u_math.h"
+
+
+#define DBG if(0) printf
+
+
+/**
+ * Allocate a new pipe_resource object
+ * width0, height0, depth0 are the dimensions of the level 0 image
+ * (the highest resolution).  last_level indicates how many mipmap levels
+ * to allocate storage for.  For non-mipmapped textures, this will be zero.
+ */
+struct pipe_resource *
+st_texture_create(struct st_context *st,
+                  enum pipe_texture_target target,
+		  enum pipe_format format,
+		  GLuint last_level,
+		  GLuint width0,
+		  GLuint height0,
+		  GLuint depth0,
+                  GLuint layers,
+                  GLuint bind )
+{
+   struct pipe_resource pt, *newtex;
+   struct pipe_screen *screen = st->pipe->screen;
+
+   assert(target < PIPE_MAX_TEXTURE_TYPES);
+   assert(width0 > 0);
+   assert(height0 > 0);
+   assert(depth0 > 0);
+   if (target == PIPE_TEXTURE_CUBE)
+      assert(layers == 6);
+
+   DBG("%s target %s format %s last_level %d\n", __FUNCTION__,
+       _mesa_lookup_enum_by_nr(target),
+       _mesa_lookup_enum_by_nr(format), last_level);
+
+   assert(format);
+   assert(screen->is_format_supported(screen, format, target, 0,
+                                      PIPE_BIND_SAMPLER_VIEW));
+
+   memset(&pt, 0, sizeof(pt));
+   pt.target = target;
+   pt.format = format;
+   pt.last_level = last_level;
+   pt.width0 = width0;
+   pt.height0 = height0;
+   pt.depth0 = depth0;
+   pt.array_size = (target == PIPE_TEXTURE_CUBE ? 6 : layers);
+   pt.usage = PIPE_USAGE_DEFAULT;
+   pt.bind = bind;
+   pt.flags = 0;
+
+   newtex = screen->resource_create(screen, &pt);
+
+   assert(!newtex || pipe_is_referenced(&newtex->reference));
+
+   return newtex;
+}
+
+
+/**
+ * In OpenGL the number of 1D array texture layers is the "height" and
+ * the number of 2D array texture layers is the "depth".  In Gallium the
+ * number of layers in an array texture is a separate 'array_size' field.
+ * This function converts dimensions from the former to the later.
+ */
+void
+st_gl_texture_dims_to_pipe_dims(GLenum texture,
+                                GLuint widthIn,
+                                GLuint heightIn,
+                                GLuint depthIn,
+                                GLuint *widthOut,
+                                GLuint *heightOut,
+                                GLuint *depthOut,
+                                GLuint *layersOut)
+{
+   switch (texture) {
+   case GL_TEXTURE_1D:
+      assert(heightIn == 1);
+      assert(depthIn == 1);
+      *widthOut = widthIn;
+      *heightOut = 1;
+      *depthOut = 1;
+      *layersOut = 1;
+      break;
+   case GL_TEXTURE_1D_ARRAY:
+      assert(depthIn == 1);
+      *widthOut = widthIn;
+      *heightOut = 1;
+      *depthOut = 1;
+      *layersOut = heightIn;
+      break;
+   case GL_TEXTURE_2D:
+   case GL_TEXTURE_RECTANGLE:
+      assert(depthIn == 1);
+      *widthOut = widthIn;
+      *heightOut = heightIn;
+      *depthOut = 1;
+      *layersOut = 1;
+      break;
+   case GL_TEXTURE_CUBE_MAP:
+      assert(depthIn == 1);
+      *widthOut = widthIn;
+      *heightOut = heightIn;
+      *depthOut = 1;
+      *layersOut = 6;
+      break;
+   case GL_TEXTURE_2D_ARRAY:
+      *widthOut = widthIn;
+      *heightOut = heightIn;
+      *depthOut = 1;
+      *layersOut = depthIn;
+      break;
+   default:
+      assert(0 && "Unexpected texture in st_gl_texture_dims_to_pipe_dims()");
+      /* fall-through */
+   case GL_TEXTURE_3D:
+      *widthOut = widthIn;
+      *heightOut = heightIn;
+      *depthOut = depthIn;
+      *layersOut = 1;
+      break;
+   }
+}
+
+
+/**
+ * Check if a texture image can be pulled into a unified mipmap texture.
+ */
+GLboolean
+st_texture_match_image(const struct pipe_resource *pt,
+                       const struct gl_texture_image *image,
+                       GLuint face, GLuint level)
+{
+   GLuint ptWidth, ptHeight, ptDepth, ptLayers;
+
+   /* Images with borders are never pulled into mipmap textures. 
+    */
+   if (image->Border) 
+      return GL_FALSE;
+
+   /* Check if this image's format matches the established texture's format.
+    */
+   if (st_mesa_format_to_pipe_format(image->TexFormat) != pt->format)
+      return GL_FALSE;
+
+   st_gl_texture_dims_to_pipe_dims(image->TexObject->Target,
+                                   image->Width, image->Height, image->Depth,
+                                   &ptWidth, &ptHeight, &ptDepth, &ptLayers);
+
+   /* Test if this image's size matches what's expected in the
+    * established texture.
+    */
+   if (ptWidth != u_minify(pt->width0, level) ||
+       ptHeight != u_minify(pt->height0, level) ||
+       ptDepth != u_minify(pt->depth0, level) ||
+       ptLayers != pt->array_size)
+      return GL_FALSE;
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Map a texture image and return the address for a particular 2D face/slice/
+ * layer.  The stImage indicates the cube face and mipmap level.  The slice
+ * of the 3D texture is passed in 'zoffset'.
+ * \param usage  one of the PIPE_TRANSFER_x values
+ * \param x, y, w, h  the region of interest of the 2D image.
+ * \return address of mapping or NULL if any error
+ */
+GLubyte *
+st_texture_image_map(struct st_context *st, struct st_texture_image *stImage,
+                     GLuint zoffset, enum pipe_transfer_usage usage,
+                     GLuint x, GLuint y, GLuint w, GLuint h)
+{
+   struct pipe_context *pipe = st->pipe;
+   struct pipe_resource *pt = stImage->pt;
+
+   DBG("%s \n", __FUNCTION__);
+
+   stImage->transfer = pipe_get_transfer(st->pipe, pt, stImage->level,
+                                         stImage->face + zoffset,
+                                         usage, x, y, w, h);
+
+   if (stImage->transfer)
+      return pipe_transfer_map(pipe, stImage->transfer);
+   else
+      return NULL;
+}
+
+
+void
+st_texture_image_unmap(struct st_context *st,
+                       struct st_texture_image *stImage)
+{
+   struct pipe_context *pipe = st->pipe;
+
+   DBG("%s\n", __FUNCTION__);
+
+   pipe_transfer_unmap(pipe, stImage->transfer);
+
+   pipe->transfer_destroy(pipe, stImage->transfer);
+}
+
+
+
+/**
+ * Upload data to a rectangular sub-region.  Lots of choices how to do this:
+ *
+ * - memcpy by span to current destination
+ * - upload data as new buffer and blit
+ *
+ * Currently always memcpy.
+ */
+static void
+st_surface_data(struct pipe_context *pipe,
+		struct pipe_transfer *dst,
+		unsigned dstx, unsigned dsty,
+		const void *src, unsigned src_stride,
+		unsigned srcx, unsigned srcy, unsigned width, unsigned height)
+{
+   void *map = pipe_transfer_map(pipe, dst);
+
+   assert(dst->resource);
+   util_copy_rect(map,
+                  dst->resource->format,
+                  dst->stride,
+                  dstx, dsty, 
+                  width, height, 
+                  src, src_stride, 
+                  srcx, srcy);
+
+   pipe_transfer_unmap(pipe, dst);
+}
+
+
+/* Upload data for a particular image.
+ */
+void
+st_texture_image_data(struct st_context *st,
+                      struct pipe_resource *dst,
+                      GLuint face,
+                      GLuint level,
+                      void *src,
+                      GLuint src_row_stride, GLuint src_image_stride)
+{
+   struct pipe_context *pipe = st->pipe;
+   GLuint i;
+   const GLubyte *srcUB = src;
+   struct pipe_transfer *dst_transfer;
+   GLuint layers;
+
+   if (dst->target == PIPE_TEXTURE_1D_ARRAY ||
+       dst->target == PIPE_TEXTURE_2D_ARRAY)
+      layers = dst->array_size;
+   else
+      layers = u_minify(dst->depth0, level);
+
+   DBG("%s\n", __FUNCTION__);
+
+   for (i = 0; i < layers; i++) {
+      dst_transfer = pipe_get_transfer(st->pipe, dst, level, face + i,
+                                       PIPE_TRANSFER_WRITE, 0, 0,
+                                       u_minify(dst->width0, level),
+                                       u_minify(dst->height0, level));
+
+      st_surface_data(pipe, dst_transfer,
+		      0, 0,                             /* dstx, dsty */
+		      srcUB,
+		      src_row_stride,
+		      0, 0,                             /* source x, y */
+		      u_minify(dst->width0, level),
+                      u_minify(dst->height0, level));    /* width, height */
+
+      pipe->transfer_destroy(pipe, dst_transfer);
+
+      srcUB += src_image_stride;
+   }
+}
+
+
+/**
+ * For debug only: get/print center pixel in the src resource.
+ */
+static void
+print_center_pixel(struct pipe_context *pipe, struct pipe_resource *src)
+{
+   struct pipe_transfer *xfer;
+   struct pipe_box region;
+   ubyte *map;
+
+   region.x = src->width0 / 2;
+   region.y = src->height0 / 2;
+   region.z = 0;
+   region.width = 1;
+   region.height = 1;
+   region.depth = 1;
+
+   xfer = pipe->get_transfer(pipe, src, 0, PIPE_TRANSFER_READ, &region);
+   map = pipe->transfer_map(pipe, xfer);
+
+   printf("center pixel: %d %d %d %d\n", map[0], map[1], map[2], map[3]);
+
+   pipe->transfer_unmap(pipe, xfer);
+   pipe->transfer_destroy(pipe, xfer);
+}
+
+
+/**
+ * Copy the image at level=0 in 'src' to the 'dst' resource at 'dstLevel'.
+ * This is used to copy mipmap images from one texture buffer to another.
+ * This typically happens when our initial guess at the total texture size
+ * is incorrect (see the guess_and_alloc_texture() function).
+ */
+void
+st_texture_image_copy(struct pipe_context *pipe,
+                      struct pipe_resource *dst, GLuint dstLevel,
+                      struct pipe_resource *src, GLuint srcLevel,
+                      GLuint face)
+{
+   GLuint width = u_minify(dst->width0, dstLevel);
+   GLuint height = u_minify(dst->height0, dstLevel);
+   GLuint depth = u_minify(dst->depth0, dstLevel);
+   struct pipe_box src_box;
+   GLuint i;
+
+   assert(u_minify(src->width0, srcLevel) == width);
+   assert(u_minify(src->height0, srcLevel) == height);
+   assert(u_minify(src->depth0, srcLevel) == depth);
+
+   src_box.x = 0;
+   src_box.y = 0;
+   src_box.width = width;
+   src_box.height = height;
+   src_box.depth = 1;
+   /* Loop over 3D image slices */
+   /* could (and probably should) use "true" 3d box here -
+      but drivers can't quite handle it yet */
+   for (i = face; i < face + depth; i++) {
+      src_box.z = i;
+
+      if (0)  {
+         print_center_pixel(pipe, src);
+      }
+
+      pipe->resource_copy_region(pipe,
+                                 dst,
+                                 dstLevel,
+                                 0, 0, i,/* destX, Y, Z */
+                                 src,
+                                 srcLevel,
+                                 &src_box);
+   }
+}
+
+
+struct pipe_resource *
+st_create_color_map_texture(struct gl_context *ctx)
+{
+   struct st_context *st = st_context(ctx);
+   struct pipe_context *pipe = st->pipe;
+   struct pipe_resource *pt;
+   enum pipe_format format;
+   const uint texSize = 256; /* simple, and usually perfect */
+
+   /* find an RGBA texture format */
+   format = st_choose_format(pipe->screen, GL_RGBA, GL_NONE, GL_NONE,
+                             PIPE_TEXTURE_2D, 0, PIPE_BIND_SAMPLER_VIEW);
+
+   /* create texture for color map/table */
+   pt = st_texture_create(st, PIPE_TEXTURE_2D, format, 0,
+                          texSize, texSize, 1, 1, PIPE_BIND_SAMPLER_VIEW);
+   return pt;
+}
+