OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

softpipe: also shortcircuit non-texture tile lookups

Browse Source
This commit is contained in:
Keith Whitwell
2009-07-22 15:36:25 +01:00
parent f911c3b989
commit 19097907ef
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/gallium/drivers/softpipe/sp_tile_cache.c
View File

@@ -49,7 +49,7 @@
* a LRU replacement policy. * a LRU replacement policy.
*/ */
#define CACHE_POS(x, y) \ #define CACHE_POS(x, y) \
(((x) / TILE_SIZE + ((y) / TILE_SIZE) * 5) % NUM_ENTRIES) (((x) + (y) * 5) % NUM_ENTRIES)
@@ -57,12 +57,10 @@
* Is the tile at (x,y) in cleared state? * Is the tile at (x,y) in cleared state?
*/ */
static INLINE uint static INLINE uint
is_clear_flag_set(const uint *bitvec, int x, int y) is_clear_flag_set(const uint *bitvec, union tile_address addr)
{ {
int pos, bit; int pos, bit;
x /= TILE_SIZE; pos = addr.bits.y * (MAX_WIDTH / TILE_SIZE) + addr.bits.x;
y /= TILE_SIZE;
pos = y * (MAX_WIDTH / TILE_SIZE) + x;
assert(pos / 32 < (MAX_WIDTH / TILE_SIZE) * (MAX_HEIGHT / TILE_SIZE) / 32); assert(pos / 32 < (MAX_WIDTH / TILE_SIZE) * (MAX_HEIGHT / TILE_SIZE) / 32);
bit = bitvec[pos / 32] & (1 << (pos & 31)); bit = bitvec[pos / 32] & (1 << (pos & 31));
return bit; return bit;
@@ -73,12 +71,10 @@ is_clear_flag_set(const uint *bitvec, int x, int y)
* Mark the tile at (x,y) as not cleared. * Mark the tile at (x,y) as not cleared.
*/ */
static INLINE void static INLINE void
clear_clear_flag(uint *bitvec, int x, int y) clear_clear_flag(uint *bitvec, union tile_address addr)
{ {
int pos; int pos;
x /= TILE_SIZE; pos = addr.bits.y * (MAX_WIDTH / TILE_SIZE) + addr.bits.x;
y /= TILE_SIZE;
pos = y * (MAX_WIDTH / TILE_SIZE) + x;
assert(pos / 32 < (MAX_WIDTH / TILE_SIZE) * (MAX_HEIGHT / TILE_SIZE) / 32); assert(pos / 32 < (MAX_WIDTH / TILE_SIZE) * (MAX_HEIGHT / TILE_SIZE) / 32);
bitvec[pos / 32] &= ~(1 << (pos & 31)); bitvec[pos / 32] &= ~(1 << (pos & 31));
} }
@@ -349,13 +345,15 @@ sp_tile_cache_flush_clear(struct softpipe_tile_cache *tc)
/* push the tile to all positions marked as clear */ /* push the tile to all positions marked as clear */
for (y = 0; y < h; y += TILE_SIZE) { for (y = 0; y < h; y += TILE_SIZE) {
for (x = 0; x < w; x += TILE_SIZE) { for (x = 0; x < w; x += TILE_SIZE) {
if (is_clear_flag_set(tc->clear_flags, x, y)) { union tile_address addr = tile_address(x, y, 0, 0, 0);
if (is_clear_flag_set(tc->clear_flags, addr)) {
pipe_put_tile_raw(pt, pipe_put_tile_raw(pt,
x, y, TILE_SIZE, TILE_SIZE, x, y, TILE_SIZE, TILE_SIZE,
tc->tile.data.color32, 0/*STRIDE*/); tc->tile.data.color32, 0/*STRIDE*/);
/* do this? */ /* do this? */
clear_clear_flag(tc->clear_flags, x, y); clear_clear_flag(tc->clear_flags, addr);
numCleared++; numCleared++;
} }
@@ -424,14 +422,14 @@ sp_flush_tile_cache(struct softpipe_tile_cache *tc)
* \param x, y position of tile, in pixels * \param x, y position of tile, in pixels
*/ */
struct softpipe_cached_tile * struct softpipe_cached_tile *
sp_get_cached_tile(struct softpipe_tile_cache *tc, int x, int y) sp_find_cached_tile(struct softpipe_tile_cache *tc,
union tile_address addr )
{ {
struct pipe_transfer *pt = tc->transfer; struct pipe_transfer *pt = tc->transfer;
/* tile pos in framebuffer: */
union tile_address addr = tile_address( x, y, 0, 0, 0 );
/* cache pos/entry: */ /* cache pos/entry: */
const int pos = CACHE_POS(x, y); const int pos = CACHE_POS(addr.bits.x,
addr.bits.y);
struct softpipe_cached_tile *tile = tc->entries + pos; struct softpipe_cached_tile *tile = tc->entries + pos;
if (addr.value != tile->addr.value) { if (addr.value != tile->addr.value) {
@@ -456,7 +454,7 @@ sp_get_cached_tile(struct softpipe_tile_cache *tc, int x, int y)
tile->addr = addr; tile->addr = addr;
if (is_clear_flag_set(tc->clear_flags, x, y)) { if (is_clear_flag_set(tc->clear_flags, addr)) {
/* don't get tile from framebuffer, just clear it */ /* don't get tile from framebuffer, just clear it */
if (tc->depth_stencil) { if (tc->depth_stencil) {
clear_tile(tile, pt->format, tc->clear_val); clear_tile(tile, pt->format, tc->clear_val);
@@ -464,7 +462,7 @@ sp_get_cached_tile(struct softpipe_tile_cache *tc, int x, int y)
else { else {
clear_tile_rgba(tile, pt->format, tc->clear_color); clear_tile_rgba(tile, pt->format, tc->clear_color);
} }
clear_clear_flag(tc->clear_flags, x, y); clear_clear_flag(tc->clear_flags, addr);
} }
else { else {
/* get new tile data from transfer */ /* get new tile data from transfer */
@@ -485,6 +483,7 @@ sp_get_cached_tile(struct softpipe_tile_cache *tc, int x, int y)
} }
} }
tc->last_tile = tile;
return tile; return tile;
} }

16
src/gallium/drivers/softpipe/sp_tile_cache.h
View File

@@ -141,7 +141,8 @@ sp_tile_cache_clear(struct softpipe_tile_cache *tc, const float *rgba,
uint clearValue); uint clearValue);
extern struct softpipe_cached_tile * extern struct softpipe_cached_tile *
sp_get_cached_tile(struct softpipe_tile_cache *tc, int x, int y); sp_find_cached_tile(struct softpipe_tile_cache *tc,
union tile_address addr );
extern const struct softpipe_cached_tile * extern const struct softpipe_cached_tile *
sp_find_cached_tile_tex(struct softpipe_tile_cache *tc, sp_find_cached_tile_tex(struct softpipe_tile_cache *tc,
@@ -179,6 +180,19 @@ sp_get_cached_tile_tex(struct softpipe_tile_cache *tc,
} }
static INLINE struct softpipe_cached_tile *
sp_get_cached_tile(struct softpipe_tile_cache *tc,
int x, int y )
{
union tile_address addr = tile_address( x, y, 0, 0, 0 );
if (tc->last_tile->addr.value == addr.value)
return tc->last_tile;
return sp_find_cached_tile( tc, addr );
}
#endif /* SP_TILE_CACHE_H */ #endif /* SP_TILE_CACHE_H */