Replacing some RADEON cmd types with r300 counterparts.
This commit is contained in:
parent
2579c32a5f
commit
f0d484fa5a
|
@ -604,7 +604,7 @@ void r300EmitBlit(r300ContextPtr rmesa,
|
|||
(drm_radeon_cmd_header_t *) r300AllocCmdBuf(rmesa, 8 * sizeof(int),
|
||||
__FUNCTION__);
|
||||
|
||||
cmd[0].header.cmd_type = RADEON_CMD_PACKET3;
|
||||
cmd[0].header.cmd_type = R300_CMD_PACKET3;
|
||||
cmd[1].i = R200_CP_CMD_BITBLT_MULTI | (5 << 16);
|
||||
cmd[2].i = (RADEON_GMC_SRC_PITCH_OFFSET_CNTL |
|
||||
RADEON_GMC_DST_PITCH_OFFSET_CNTL |
|
||||
|
@ -627,7 +627,7 @@ void r300EmitWait(r300ContextPtr rmesa, GLuint flags)
|
|||
if (rmesa->radeon.dri.drmMinor >= 6) {
|
||||
drm_radeon_cmd_header_t *cmd;
|
||||
|
||||
assert(!(flags & ~(RADEON_WAIT_2D | RADEON_WAIT_3D)));
|
||||
assert(!(flags & ~(R300_WAIT_2D | R300_WAIT_3D)));
|
||||
|
||||
cmd =
|
||||
(drm_radeon_cmd_header_t *) r300AllocCmdBuf(rmesa,
|
||||
|
|
|
@ -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, ®ion, __FUNCTION__);
|
||||
done += lines;
|
||||
|
|
Loading…
Reference in New Issue