summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2008-10-14 12:41:46 -0600
committerBrian Paul <[email protected]>2008-10-14 12:54:30 -0600
commit58ea98dc68605130dda2538027f941df39ccd514 (patch)
treebb8e9b665c5a1e7240e3991cfb1a5bfa411c3775 /src
parentf8bddf698d523f597fea0f721b064daee81d8005 (diff)
cell: fix assertions
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/cell/ppu/cell_texture.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/cell/ppu/cell_texture.c b/src/gallium/drivers/cell/ppu/cell_texture.c
index 608bda35f76..87f1598dae6 100644
--- a/src/gallium/drivers/cell/ppu/cell_texture.c
+++ b/src/gallium/drivers/cell/ppu/cell_texture.c
@@ -155,7 +155,7 @@ cell_texture_release(struct pipe_screen *screen,
* Convert image from linear layout to tiled layout. 4-byte pixels.
*/
static void
-swizzle_image_uint(uint w, uint h, uint tile_size, uint *dst,
+twiddle_image_uint(uint w, uint h, uint tile_size, uint *dst,
uint src_stride, const uint *src)
{
const uint tile_size2 = tile_size * tile_size;
@@ -179,8 +179,8 @@ swizzle_image_uint(uint w, uint h, uint tile_size, uint *dst,
for (j = 0; j < tile_width; j++) {
const uint srci = it * tile_size + i;
const uint srcj = jt * tile_size + j;
- ASSERT(srci < w);
- ASSERT(srcj < h);
+ ASSERT(srci < h);
+ ASSERT(srcj < w);
tdst[i * tile_size + j] = src[srci * src_stride + srcj];
}
}
@@ -214,12 +214,12 @@ cell_twiddle_texture(struct pipe_screen *screen,
}
/* alloc new tiled data */
texture->tiled_data[level] = align_malloc(bufWidth * bufHeight * 4, 16);
- swizzle_image_uint(texWidth, texHeight, TILE_SIZE,
+ twiddle_image_uint(texWidth, texHeight, TILE_SIZE,
texture->tiled_data[level],
surface->stride, src);
break;
default:
- printf("Unsupported texture format\n");
+ printf("Cell: twiddle unsupported texture format\n");
;
}