fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-27 08:50:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cell: minor texture improvements

Browse source 
Precompute tiles_per_row.  Use ushort multiplies in a few places.  New comments.
This commit is contained in:
Brian 2008-04-02 14:01:42 -06:00
parent 1307eebfa0
commit 217d379407
3 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/cell/spu/spu_main.c
View file

@ -343,6 +343,8 @@ cmd_state_texture(const struct cell_command_texture *texture)
spu.texture[unit].width = width;
spu.texture[unit].height = height;
spu.texture[unit].tiles_per_row = width / TILE_SIZE;
spu.texture[unit].tex_size = (vector float) { width, height, 0.0, 0.0};
spu.texture[unit].tex_size_mask = (vector unsigned int)
{ width - 1, height - 1, 0, 0 };

3
src/gallium/drivers/cell/spu/spu_main.h
View file

@ -105,7 +105,8 @@ struct spu_framebuffer {
struct spu_texture
{
void *start;
uint width, height;
ushort width, height;
ushort tiles_per_row;
vector float tex_size;
vector unsigned int tex_size_mask; /**< == int(size - 1) */
vector unsigned int tex_size_x_mask; /**< == int(size - 1) */

32
src/gallium/drivers/cell/spu/spu_texture.c
View file

@ -51,22 +51,25 @@ invalidate_tex_cache(void)
static uint
get_texel(uint unit, vec_uint4 coordinate)
{
const unsigned texture_ea = (uintptr_t) spu.texture[unit].start;
ushort x = spu_extract(coordinate, 0);
ushort y = spu_extract(coordinate, 1);
unsigned tile_offset = sizeof(tile_t)
* ((y / TILE_SIZE * spu.texture[unit].tiles_per_row) + (x / TILE_SIZE));
ushort texel_offset = (ushort) 4
* (ushort) (((ushort) (y % TILE_SIZE) * (ushort) TILE_SIZE) + (x % TILE_SIZE));
vec_uint4 tmp;
unsigned x = spu_extract(coordinate, 0);
unsigned y = spu_extract(coordinate, 1);
const unsigned tiles_per_row = spu.texture[unit].width / TILE_SIZE;
unsigned tile_offset = sizeof(tile_t) * ((y / TILE_SIZE * tiles_per_row)
+ (x / TILE_SIZE));
unsigned texel_offset = 4 * (((y % TILE_SIZE) * TILE_SIZE)
+ (x % TILE_SIZE));
spu_dcache_fetch_unaligned((qword *) & tmp,
spu.texture[unit].start + tile_offset + texel_offset,
texture_ea + tile_offset + texel_offset,
4);
return spu_extract(tmp, 0);
}
/**
* Get four texels from locations (x[0], y[0]), (x[1], y[1]) ...
*/
static void
get_four_texels(uint unit, vec_uint4 x, vec_uint4 y, vec_uint4 *texels)
{
@ -76,7 +79,7 @@ get_four_texels(uint unit, vec_uint4 x, vec_uint4 y, vec_uint4 *texels)
const qword offset_x = si_andi((qword) x, 0x1f);
const qword offset_y = si_andi((qword) y, 0x1f);
const qword tiles_per_row = (qword) spu_splats(spu.texture[unit].width / TILE_SIZE);
const qword tiles_per_row = (qword) spu_splats(spu.texture[unit].tiles_per_row);
const qword tile_size = (qword) spu_splats(sizeof(tile_t));
qword tile_offset = si_mpya((qword) tile_y, tiles_per_row, (qword) tile_x);
@ -97,6 +100,7 @@ get_four_texels(uint unit, vec_uint4 x, vec_uint4 y, vec_uint4 *texels)
texture_ea + spu_extract(offset, 3), 4);
}
/**
* Get texture sample at texcoord.
* XXX this is extremely primitive for now.
@ -126,17 +130,25 @@ sample_texture_bilinear(uint unit, vector float texcoord)
vec_uint4 texels[4];
/* setup texcoords for quad:
* +-----+-----+
* |x0,y0|x1,y1|
* +-----+-----+
* |x2,y2|x3,y3|
* +-----+-----+
*/
vec_uint4 x = spu_splats(spu_extract(itc, 0));
vec_uint4 y = spu_splats(spu_extract(itc, 1));
x = spu_add(x, offset_x);
y = spu_add(y, offset_y);
/* GL_REPEAT wrap mode: */
x = spu_and(x, spu.texture[unit].tex_size_x_mask);
y = spu_and(y, spu.texture[unit].tex_size_y_mask);
get_four_texels(unit, x, y, texels);
/* integer A8R8G8B8 to float texel conversion */
vector float texel00 = spu_unpack_A8R8G8B8(spu_extract(texels[0], 0));
vector float texel01 = spu_unpack_A8R8G8B8(spu_extract(texels[1], 0));
vector float texel10 = spu_unpack_A8R8G8B8(spu_extract(texels[2], 0));