summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r300/r300_texmem.c
diff options
context:
space:
mode:
authorAapo Tahkola <aet@rasterburn.org>2005-03-08 22:29:45 +0000
committerAapo Tahkola <aet@rasterburn.org>2005-03-08 22:29:45 +0000
commitf0d484fa5aaa532c49d13c2b4a3bd5a37e1524d7 (patch)
tree11c35dcdc18ed13a418b6a6d23b9ed23623c1469 /src/mesa/drivers/dri/r300/r300_texmem.c
parent2579c32a5f53a0ad89f5af6111d5935529fd3b45 (diff)
Replacing some RADEON cmd types with r300 counterparts.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_texmem.c')
-rw-r--r--src/mesa/drivers/dri/r300/r300_texmem.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_texmem.c b/src/mesa/drivers/dri/r300/r300_texmem.c
index de011d7e39..5c70e2e3c5 100644
--- a/src/mesa/drivers/dri/r300/r300_texmem.c
+++ b/src/mesa/drivers/dri/r300/r300_texmem.c
@@ -140,7 +140,7 @@ static void r300UploadGARTClientSubImage(r300ContextPtr rmesa,
width = texImage->Width;
height = texImage->Height;
- r300EmitWait(rmesa, RADEON_WAIT_3D);
+ r300EmitWait(rmesa, R300_WAIT_3D);
r300EmitBlit(rmesa, blit_format,
srcPitch,
@@ -152,7 +152,7 @@ static void r300UploadGARTClientSubImage(r300ContextPtr rmesa,
t->image[0][hwlevel].x + x,
t->image[0][hwlevel].y + y, width, height);
- r300EmitWait(rmesa, RADEON_WAIT_2D);
+ r300EmitWait(rmesa, R300_WAIT_2D);
}
static void r300UploadRectSubImage(r300ContextPtr rmesa,
@@ -254,7 +254,7 @@ static void r300UploadRectSubImage(r300ContextPtr rmesa,
}
}
- r300EmitWait(rmesa, RADEON_WAIT_3D);
+ r300EmitWait(rmesa, R300_WAIT_3D);
/* Blit to framebuffer
*/
@@ -264,7 +264,7 @@ static void r300UploadRectSubImage(r300ContextPtr rmesa,
dstPitch, t->bufAddr,
0, 0, 0, done, width, lines);
- r300EmitWait(rmesa, RADEON_WAIT_2D);
+ r300EmitWait(rmesa, R300_WAIT_2D);
r300ReleaseDmaRegion(rmesa, &region, __FUNCTION__);
done += lines;