Mesa (radeon-rewrite): r200: cs emit state fixups
Dave Airlie
airlied at kemper.freedesktop.org
Thu Mar 5 11:40:18 UTC 2009
Module: Mesa
Branch: radeon-rewrite
Commit: b074aacdb2a9e3520ccd6cfd892b60599ad0d1d8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b074aacdb2a9e3520ccd6cfd892b60599ad0d1d8
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Mar 6 05:42:37 2009 +1000
r200: cs emit state fixups
---
src/mesa/drivers/dri/r200/r200_state_init.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/mesa/drivers/dri/r200/r200_state_init.c b/src/mesa/drivers/dri/r200/r200_state_init.c
index f7149c3..a71f33c 100644
--- a/src/mesa/drivers/dri/r200/r200_state_init.c
+++ b/src/mesa/drivers/dri/r200/r200_state_init.c
@@ -515,7 +515,7 @@ static void ctx_emit_cs(GLcontext *ctx, struct radeon_state_atom *atom)
atom->cmd[CTX_RB3D_ZSTENCILCNTL] |= depth_fmt;
}
- dwords = 14;
+ dwords = 10;
if (drb)
dwords += 6;
if (rrb)
@@ -565,6 +565,7 @@ static void tex_emit(GLcontext *ctx, struct radeon_state_atom *atom)
uint32_t dwords = atom->cmd_size;
int i = atom->idx;
radeonTexObj *t = r200->state.texture.unit[i].texobj;
+ radeon_mipmap_level *lvl;
if (t && t->mt && !t->image_override)
dwords += 2;
@@ -606,15 +607,16 @@ static void tex_emit_cs(GLcontext *ctx, struct radeon_state_atom *atom)
if (!t->mt && !t->bo)
hastexture = 0;
}
- dwords += 1;
+
+ dwords += 2;
if (hastexture)
dwords += 2;
else
dwords -= 2;
BEGIN_BATCH_NO_AUTOSTATE(dwords);
- OUT_BATCH(CP_PACKET0(R200_PP_TXFILTER_0 + (24 * i), 8));
- OUT_BATCH_TABLE((atom->cmd + 1), 9);
+ OUT_BATCH(CP_PACKET0(R200_PP_TXFILTER_0 + (24 * i), 7));
+ OUT_BATCH_TABLE((atom->cmd + 1), 8);
if (hastexture) {
OUT_BATCH(CP_PACKET0(R200_PP_TXOFFSET_0 + (24 * i), 0));
More information about the mesa-commit
mailing list