softpipe: raise number of bits used for X coordinate texture lookup
With buffers the addressing is done on a per byte basis and we with a maximal block size of 16 byte we have to take into acount four more bits. For simplicity just remove the TEX_TILE_SIZE_LOG2, which is 5 bit. Signed-off-by: Gert Wollny <gert.wollny@collabora.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
11f219a5ee
commit
47dd7c4054
|
@ -50,7 +50,7 @@ sp_create_tex_tile_cache( struct pipe_context *pipe )
|
||||||
uint pos;
|
uint pos;
|
||||||
|
|
||||||
/* make sure max texture size works */
|
/* make sure max texture size works */
|
||||||
assert((TEX_TILE_SIZE << TEX_ADDR_BITS) >= (1 << (SP_MAX_TEXTURE_2D_LEVELS-1)));
|
assert((TEX_TILE_SIZE << TEX_Y_BITS) >= (1 << (SP_MAX_TEXTURE_2D_LEVELS-1)));
|
||||||
|
|
||||||
tc = CALLOC_STRUCT( softpipe_tex_tile_cache );
|
tc = CALLOC_STRUCT( softpipe_tex_tile_cache );
|
||||||
if (tc) {
|
if (tc) {
|
||||||
|
|
|
@ -43,18 +43,17 @@ struct softpipe_tex_tile_cache;
|
||||||
#define TEX_TILE_SIZE_LOG2 5
|
#define TEX_TILE_SIZE_LOG2 5
|
||||||
#define TEX_TILE_SIZE (1 << TEX_TILE_SIZE_LOG2)
|
#define TEX_TILE_SIZE (1 << TEX_TILE_SIZE_LOG2)
|
||||||
|
|
||||||
|
#define TEX_ADDR_BITS (SP_MAX_TEXTURE_2D_LEVELS - 1)
|
||||||
#define TEX_ADDR_BITS (SP_MAX_TEXTURE_2D_LEVELS - 1 - TEX_TILE_SIZE_LOG2)
|
#define TEX_Y_BITS (SP_MAX_TEXTURE_2D_LEVELS - 1 - TEX_TILE_SIZE_LOG2)
|
||||||
#define TEX_Z_BITS (SP_MAX_TEXTURE_2D_LEVELS - 1)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Texture tile address as a union for fast compares.
|
* Texture tile address as a union for fast compares.
|
||||||
*/
|
*/
|
||||||
union tex_tile_address {
|
union tex_tile_address {
|
||||||
struct {
|
struct {
|
||||||
unsigned x:TEX_ADDR_BITS; /* 16K / TILE_SIZE */
|
unsigned x:TEX_ADDR_BITS; /* 16K -- need extra bits for texture buffers */
|
||||||
unsigned y:TEX_ADDR_BITS; /* 16K / TILE_SIZE */
|
unsigned y:TEX_Y_BITS; /* 16K / TILE_SIZE */
|
||||||
unsigned z:TEX_Z_BITS; /* 16K -- z not tiled */
|
unsigned z:TEX_ADDR_BITS; /* 16K -- z not tiled */
|
||||||
unsigned level:4;
|
unsigned level:4;
|
||||||
unsigned invalid:1;
|
unsigned invalid:1;
|
||||||
} bits;
|
} bits;
|
||||||
|
|
Loading…
Reference in New Issue