diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2006-09-12 18:34:43 +0000 |
|---|---|---|
| committer | Jerome Glisse <glisse@freedesktop.org> | 2006-09-12 18:34:43 +0000 |
| commit | 6a65e6db3d9a64cd2b233155a05074a3eb5c1975 (patch) | |
| tree | 0d74c2b1c7fecf2a5993d192a02e9ab826713f3b /src/mesa/drivers/dri/r300/r300_texmem.c | |
| parent | b1cb39d8bdb6707be2e44d38c52f44515bcbf16e (diff) | |
Removing some of r200 dependency, cleaning up code a bit,
and fixing a couple of warning. More cleanup and shuffle
to come. I have tested this change they might broke things
especialy with r300_texstate.c change (format_x doesn't
seems to be use at all by r300).
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_texmem.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_texmem.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_texmem.c b/src/mesa/drivers/dri/r300/r300_texmem.c index c1d01020cd..96973c0098 100644 --- a/src/mesa/drivers/dri/r300/r300_texmem.c +++ b/src/mesa/drivers/dri/r300/r300_texmem.c @@ -116,23 +116,23 @@ static void r300UploadGARTClientSubImage(r300ContextPtr rmesa, */ switch (texFormat->TexelBytes) { case 1: - blit_format = R200_CP_COLOR_FORMAT_CI8; + blit_format = R300_CP_COLOR_FORMAT_CI8; srcPitch = t->image[0][0].width * texFormat->TexelBytes; dstPitch = t->image[0][0].width * texFormat->TexelBytes; break; case 2: - blit_format = R200_CP_COLOR_FORMAT_RGB565; + blit_format = R300_CP_COLOR_FORMAT_RGB565; srcPitch = t->image[0][0].width * texFormat->TexelBytes; dstPitch = t->image[0][0].width * texFormat->TexelBytes; break; case 4: - blit_format = R200_CP_COLOR_FORMAT_ARGB8888; + blit_format = R300_CP_COLOR_FORMAT_ARGB8888; srcPitch = t->image[0][0].width * texFormat->TexelBytes; dstPitch = t->image[0][0].width * texFormat->TexelBytes; break; case 8: case 16: - blit_format = R200_CP_COLOR_FORMAT_CI8; + blit_format = R300_CP_COLOR_FORMAT_CI8; srcPitch = t->image[0][0].width * texFormat->TexelBytes; dstPitch = t->image[0][0].width * texFormat->TexelBytes; break; @@ -179,17 +179,17 @@ static void r300UploadRectSubImage(r300ContextPtr rmesa, switch (texFormat->TexelBytes) { case 1: - blit_format = R200_CP_COLOR_FORMAT_CI8; + blit_format = R300_CP_COLOR_FORMAT_CI8; break; case 2: - blit_format = R200_CP_COLOR_FORMAT_RGB565; + blit_format = R300_CP_COLOR_FORMAT_RGB565; break; case 4: - blit_format = R200_CP_COLOR_FORMAT_ARGB8888; + blit_format = R300_CP_COLOR_FORMAT_ARGB8888; break; case 8: case 16: - blit_format = R200_CP_COLOR_FORMAT_CI8; + blit_format = R300_CP_COLOR_FORMAT_CI8; break; default: return; @@ -457,8 +457,8 @@ static void uploadSubImage( r300ContextPtr rmesa, r300TexObjPtr t, needed (only with dxt1 since 2 dxt3/dxt5 blocks already use 32 Byte). */ /* set tex.height to 1/4 since 1 "macropixel" (dxt-block) has 4 real pixels. Needed so the kernel module reads the right amount of data. */ - tex.format = R200_TXFORMAT_I8; /* any 1-byte texel format */ - tex.pitch = (BLIT_WIDTH_BYTES / 64); + tex.format = RADEON_TXFORMAT_I8; /* any 1-byte texel format */ + tex.pitch = (R300_BLIT_WIDTH_BYTES / 64); tex.height = (imageHeight + 3) / 4; tex.width = (imageWidth + 3) / 4; if ((t->format & R300_TX_FORMAT_DXT1) == R300_TX_FORMAT_DXT1) |