Merge branch 'mesa_7_6_branch'

Conflicts:

	src/gallium/drivers/softpipe/sp_tile_cache.c

diff --cc src/gallium/drivers/softpipe/sp_tex_tile_cache.h
index c6003f35508a34929df6dcf8c22fc6c0816c9b26,0000000000000000000000000000000000000000..04e65ce2200df2be91c994e142808c629127134d
mode 100644,000000..100644
--- 1/src/gallium/drivers/softpipe/sp_tex_tile_cache.h
--- /dev/null
+++ b/src/gallium/drivers/softpipe/sp_tex_tile_cache.h
@@@ -1,161 -1,0 +1,155 @@@
- 
- /** XXX move these */
- #define MAX_WIDTH 2048
- #define MAX_HEIGHT 2048
- 
- 
 +/**************************************************************************
 + * 
 + * 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.
 + * 
 + **************************************************************************/
 +
 +#ifndef SP_TEX_TILE_CACHE_H
 +#define SP_TEX_TILE_CACHE_H
 +
 +
 +#include "pipe/p_compiler.h"
 +
 +
 +struct softpipe_context;
 +struct softpipe_tex_tile_cache;
 +
 +
 +/**
 + * Cache tile size (width and height). This needs to be a power of two.
 + */
 +#define TILE_SIZE 64
 +
 +
 +/* If we need to support > 4096, just expand this to be a 64 bit
 + * union, or consider tiling in Z as well.
 + */
 +union tex_tile_address {
 +   struct {
 +      unsigned x:6;             /* 4096 / TILE_SIZE */
 +      unsigned y:6;             /* 4096 / TILE_SIZE */
 +      unsigned z:12;            /* 4096 -- z not tiled */
 +      unsigned face:3;
 +      unsigned level:4;
 +      unsigned invalid:1;
 +   } bits;
 +   unsigned value;
 +};
 +
 +
 +struct softpipe_tex_cached_tile
 +{
 +   union tex_tile_address addr;
 +   union {
 +      float color[TILE_SIZE][TILE_SIZE][4];
 +   } data;
 +};
 +
 +#define NUM_ENTRIES 50
 +
 +struct softpipe_tex_tile_cache
 +{
 +   struct pipe_screen *screen;
 +   struct pipe_transfer *transfer;
 +   void *transfer_map;
 +
 +   struct pipe_texture *texture;  /**< if caching a texture */
 +   unsigned timestamp;
 +
 +   struct softpipe_tex_cached_tile entries[NUM_ENTRIES];
 +
 +   struct pipe_transfer *tex_trans;
 +   void *tex_trans_map;
 +   int tex_face, tex_level, tex_z;
 +
 +   struct softpipe_tex_cached_tile *last_tile;  /**< most recently retrieved tile */
 +};
 +
 +
 +extern struct softpipe_tex_tile_cache *
 +sp_create_tex_tile_cache( struct pipe_screen *screen );
 +
 +extern void
 +sp_destroy_tex_tile_cache(struct softpipe_tex_tile_cache *tc);
 +
 +
 +extern void
 +sp_tex_tile_cache_map_transfers(struct softpipe_tex_tile_cache *tc);
 +
 +extern void
 +sp_tex_tile_cache_unmap_transfers(struct softpipe_tex_tile_cache *tc);
 +
 +extern void
 +sp_tex_tile_cache_set_texture(struct softpipe_tex_tile_cache *tc,
 +                          struct pipe_texture *texture);
 +
 +void
 +sp_tex_tile_cache_validate_texture(struct softpipe_tex_tile_cache *tc);
 +
 +extern void
 +sp_flush_tex_tile_cache(struct softpipe_tex_tile_cache *tc);
 +
 +
 +
 +extern const struct softpipe_tex_cached_tile *
 +sp_find_cached_tile_tex(struct softpipe_tex_tile_cache *tc, 
 +                         union tex_tile_address addr );
 +
 +static INLINE const union tex_tile_address
 +tex_tile_address( unsigned x,
 +                unsigned y,
 +                unsigned z,
 +                unsigned face,
 +                unsigned level )
 +{
 +   union tex_tile_address addr;
 +
 +   addr.value = 0;
 +   addr.bits.x = x / TILE_SIZE;
 +   addr.bits.y = y / TILE_SIZE;
 +   addr.bits.z = z;
 +   addr.bits.face = face;
 +   addr.bits.level = level;
 +      
 +   return addr;
 +}
 +
 +/* Quickly retrieve tile if it matches last lookup.
 + */
 +static INLINE const struct softpipe_tex_cached_tile *
 +sp_get_cached_tile_tex(struct softpipe_tex_tile_cache *tc, 
 +                         union tex_tile_address addr )
 +{
 +   if (tc->last_tile->addr.value == addr.value)
 +      return tc->last_tile;
 +
 +   return sp_find_cached_tile_tex( tc, addr );
 +}
 +
 +
 +
 +
 +
 +#endif /* SP_TEX_TILE_CACHE_H */
 +

diff --cc src/gallium/drivers/softpipe/sp_tile_cache.c
Simple merge

diff --cc src/gallium/drivers/softpipe/sp_tile_cache.h
index a80678e8658610a3bcd71c31c36c29d9e632db41,8f247d0e580451508dae9e0dff91fdce2f7f48b1..f21c74cb9ce4f899124155b3cdd1405f09d4102e
--- 1/src/gallium/drivers/softpipe/sp_tile_cache.h
--- 2/src/gallium/drivers/softpipe/sp_tile_cache.h
+++ b/src/gallium/drivers/softpipe/sp_tile_cache.h
@@@ -70,32 -59,6 +70,32 @@@ struct softpipe_cached_til
     } data;
  };
  
- #define MAX_WIDTH 2048
- #define MAX_HEIGHT 2048
 +#define NUM_ENTRIES 50
 +
 +
 +/** XXX move these */
++#define MAX_WIDTH 4096
++#define MAX_HEIGHT 4096
 +
 +
 +struct softpipe_tile_cache
 +{
 +   struct pipe_screen *screen;
 +   struct pipe_surface *surface;  /**< the surface we're caching */
 +   struct pipe_transfer *transfer;
 +   void *transfer_map;
 +
 +   struct softpipe_cached_tile entries[NUM_ENTRIES];
 +   uint clear_flags[(MAX_WIDTH / TILE_SIZE) * (MAX_HEIGHT / TILE_SIZE) / 32];
 +   float clear_color[4];  /**< for color bufs */
 +   uint clear_val;        /**< for z+stencil, or packed color clear value */
 +   boolean depth_stencil; /**< Is the surface a depth/stencil format? */
 +
 +   struct softpipe_cached_tile tile;  /**< scratch tile for clears */
 +
 +   struct softpipe_cached_tile *last_tile;  /**< most recently retrieved tile */
 +};
 +
  
  extern struct softpipe_tile_cache *
  sp_create_tile_cache( struct pipe_screen *screen );