/**************************************************************************
*
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* 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
+ * IN NO EVENT SHALL VMWARE 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 "util/u_inlines.h"
#include "util/u_memory.h"
#include "util/u_tile.h"
+#include "util/u_format.h"
#include "util/u_math.h"
#include "sp_context.h"
#include "sp_texture.h"
uint pos;
/* make sure max texture size works */
- assert((TILE_SIZE << TEX_ADDR_BITS) >= (1 << (SP_MAX_TEXTURE_2D_LEVELS-1)));
+ assert((TEX_TILE_SIZE << TEX_ADDR_BITS) >= (1 << (SP_MAX_TEXTURE_2D_LEVELS-1)));
tc = CALLOC_STRUCT( softpipe_tex_tile_cache );
if (tc) {
tc->pipe = pipe;
- for (pos = 0; pos < NUM_ENTRIES; pos++) {
+ for (pos = 0; pos < Elements(tc->entries); pos++) {
tc->entries[pos].addr.bits.invalid = 1;
}
tc->last_tile = &tc->entries[0]; /* any tile */
if (tc) {
uint pos;
- for (pos = 0; pos < NUM_ENTRIES; pos++) {
+ for (pos = 0; pos < Elements(tc->entries); pos++) {
/*assert(tc->entries[pos].x < 0);*/
}
if (tc->transfer) {
- tc->pipe->transfer_destroy(tc->pipe, tc->transfer);
+ tc->pipe->transfer_unmap(tc->pipe, tc->transfer);
}
if (tc->tex_trans) {
- tc->pipe->transfer_destroy(tc->pipe, tc->tex_trans);
+ tc->pipe->transfer_unmap(tc->pipe, tc->tex_trans);
}
FREE( tc );
}
-
-
-void
-sp_tex_tile_cache_map_transfers(struct softpipe_tex_tile_cache *tc)
-{
- if (tc->tex_trans && !tc->tex_trans_map)
- tc->tex_trans_map = tc->pipe->transfer_map(tc->pipe, tc->tex_trans);
-}
-
-
-void
-sp_tex_tile_cache_unmap_transfers(struct softpipe_tex_tile_cache *tc)
-{
- if (tc->tex_trans_map) {
- tc->pipe->transfer_unmap(tc->pipe, tc->tex_trans);
- tc->tex_trans_map = NULL;
- }
-}
-
/**
* Invalidate all cached tiles for the cached texture.
* Should be called when the texture is modified.
assert(tc);
assert(tc->texture);
- for (i = 0; i < NUM_ENTRIES; i++) {
+ for (i = 0; i < Elements(tc->entries); i++) {
tc->entries[i].addr.bits.invalid = 1;
}
}
if (!sp_tex_tile_is_compat_view(tc, view)) {
pipe_resource_reference(&tc->texture, texture);
- if (tc->tex_trans) {
- if (tc->tex_trans_map) {
- tc->pipe->transfer_unmap(tc->pipe, tc->tex_trans);
- tc->tex_trans_map = NULL;
- }
-
- tc->pipe->transfer_destroy(tc->pipe, tc->tex_trans);
+ if (tc->tex_trans_map) {
+ tc->pipe->transfer_unmap(tc->pipe, tc->tex_trans);
tc->tex_trans = NULL;
+ tc->tex_trans_map = NULL;
}
if (view) {
/* mark as entries as invalid/empty */
/* XXX we should try to avoid this when the teximage hasn't changed */
- for (i = 0; i < NUM_ENTRIES; i++) {
+ for (i = 0; i < Elements(tc->entries); i++) {
tc->entries[i].addr.bits.invalid = 1;
}
if (tc->texture) {
/* caching a texture, mark all entries as empty */
- for (pos = 0; pos < NUM_ENTRIES; pos++) {
+ for (pos = 0; pos < Elements(tc->entries); pos++) {
tc->entries[pos].addr.bits.invalid = 1;
}
tc->tex_face = -1;
addr.bits.face +
addr.bits.level * 7);
- return entry % NUM_ENTRIES;
+ return entry % NUM_TEX_TILE_ENTRIES;
}
/**
union tex_tile_address addr )
{
struct softpipe_tex_cached_tile *tile;
-
+ boolean zs = util_format_is_depth_or_stencil(tc->format);
+
tile = tc->entries + tex_cache_pos( addr );
if (addr.value != tile->addr.value) {
- /* cache miss. Most misses are because we've invaldiated the
+ /* cache miss. Most misses are because we've invalidated the
* texture cache previously -- most commonly on binding a new
* texture. Currently we effectively flush the cache on texture
* bind.
tc->tex_level != addr.bits.level ||
tc->tex_z != addr.bits.z) {
/* get new transfer (view into texture) */
+ unsigned width, height, layer;
- if (tc->tex_trans) {
- if (tc->tex_trans_map) {
- tc->pipe->transfer_unmap(tc->pipe, tc->tex_trans);
- tc->tex_trans_map = NULL;
- }
-
- tc->pipe->transfer_destroy(tc->pipe, tc->tex_trans);
+ if (tc->tex_trans_map) {
+ tc->pipe->transfer_unmap(tc->pipe, tc->tex_trans);
tc->tex_trans = NULL;
+ tc->tex_trans_map = NULL;
+ }
+
+ width = u_minify(tc->texture->width0, addr.bits.level);
+ if (tc->texture->target == PIPE_TEXTURE_1D_ARRAY) {
+ height = tc->texture->array_size;
+ layer = 0;
+ }
+ else {
+ height = u_minify(tc->texture->height0, addr.bits.level);
+ layer = addr.bits.face + addr.bits.z;
}
- tc->tex_trans =
- pipe_get_transfer(tc->pipe, tc->texture,
+ tc->tex_trans_map =
+ pipe_transfer_map(tc->pipe, tc->texture,
addr.bits.level,
- addr.bits.face + addr.bits.z,
+ layer,
PIPE_TRANSFER_READ | PIPE_TRANSFER_UNSYNCHRONIZED,
- 0, 0,
- u_minify(tc->texture->width0, addr.bits.level),
- u_minify(tc->texture->height0, addr.bits.level));
-
- tc->tex_trans_map = tc->pipe->transfer_map(tc->pipe, tc->tex_trans);
+ 0, 0, width, height, &tc->tex_trans);
tc->tex_face = addr.bits.face;
tc->tex_level = addr.bits.level;
tc->tex_z = addr.bits.z;
}
- /* get tile from the transfer (view into texture)
- * Note we're using the swizzle version of this fuction only because
- * we need to pass the texture cache's format explicitly.
+ /* Get tile from the transfer (view into texture), explicitly passing
+ * the image format.
*/
- pipe_get_tile_swizzle(tc->pipe,
- tc->tex_trans,
- addr.bits.x * TILE_SIZE,
- addr.bits.y * TILE_SIZE,
- TILE_SIZE,
- TILE_SIZE,
- PIPE_SWIZZLE_RED,
- PIPE_SWIZZLE_GREEN,
- PIPE_SWIZZLE_BLUE,
- PIPE_SWIZZLE_ALPHA,
- tc->format,
- (float *) tile->data.color);
-
+ if (!zs && util_format_is_pure_uint(tc->format)) {
+ pipe_get_tile_ui_format(tc->tex_trans, tc->tex_trans_map,
+ addr.bits.x * TEX_TILE_SIZE,
+ addr.bits.y * TEX_TILE_SIZE,
+ TEX_TILE_SIZE,
+ TEX_TILE_SIZE,
+ tc->format,
+ (unsigned *) tile->data.colorui);
+ } else if (!zs && util_format_is_pure_sint(tc->format)) {
+ pipe_get_tile_i_format(tc->tex_trans, tc->tex_trans_map,
+ addr.bits.x * TEX_TILE_SIZE,
+ addr.bits.y * TEX_TILE_SIZE,
+ TEX_TILE_SIZE,
+ TEX_TILE_SIZE,
+ tc->format,
+ (int *) tile->data.colori);
+ } else {
+ pipe_get_tile_rgba_format(tc->tex_trans, tc->tex_trans_map,
+ addr.bits.x * TEX_TILE_SIZE,
+ addr.bits.y * TEX_TILE_SIZE,
+ TEX_TILE_SIZE,
+ TEX_TILE_SIZE,
+ tc->format,
+ (float *) tile->data.color);
+ }
tile->addr = addr;
}