From: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Thu, 21 Jan 2010 22:30:16 +0000 (-0500)
Subject: r200: fix CS section size mismatch
X-Git-Tag: 062012170305~12852^2~1452^2~62
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2cf8164065b8704e2f32d77af14cde9e7979435c;p=profile%2Fivi%2Fmesa.git

r200: fix CS section size mismatch

Partial fix for fdo bug 25544

The tex handling will still need CS drm changes,
see bug 25544 for more.
---

diff --git a/src/mesa/drivers/dri/r200/r200_state_init.c b/src/mesa/drivers/dri/r200/r200_state_init.c
index 6c5a0b7..80b08dc 100644
--- a/src/mesa/drivers/dri/r200/r200_state_init.c
+++ b/src/mesa/drivers/dri/r200/r200_state_init.c
@@ -698,7 +698,8 @@ static void tex_emit_mm(GLcontext *ctx, struct radeon_state_atom *atom)
    uint32_t dwords = atom->check(ctx, atom);
    int i = atom->idx;
    radeonTexObj *t = r200->state.texture.unit[i].texobj;
-   if (!r200->state.texture.unit[i].unitneeded)
+
+   if (!r200->state.texture.unit[i].unitneeded && !(dwords <= atom->cmd_size))
         dwords -= 4;
    BEGIN_BATCH_NO_AUTOSTATE(dwords);