radeon: r100 clean up CS packet size calc

This commit is contained in:
Dave Airlie 2009-03-04 22:26:44 +10:00
parent 924bf0d8d3
commit 31f1298807

View file

@ -426,10 +426,11 @@ static void ctx_emit_cs(GLcontext *ctx, struct radeon_state_atom *atom)
}
/* output the first 7 bytes of context */
dwords = 10;
if (drb)
dwords += 2;
dwords += 6;
if (rrb)
dwords += 2;
dwords += 6;
BEGIN_BATCH_NO_AUTOSTATE(dwords);
/* In the CS case we need to split this up */
@ -453,9 +454,7 @@ static void ctx_emit_cs(GLcontext *ctx, struct radeon_state_atom *atom)
if (rrb) {
OUT_BATCH(CP_PACKET0(RADEON_RB3D_COLOROFFSET, 0));
OUT_BATCH_RELOC(0, rrb->bo, 0, 0, RADEON_GEM_DOMAIN_VRAM, 0);
}
if (rrb) {
OUT_BATCH(CP_PACKET0(RADEON_RB3D_COLORPITCH, 0));
OUT_BATCH(cbpitch);
}