r300g: fix assertion failure in emit_dsa_state

Broken by 8ed6b1400b.
This commit is contained in:
Marek Olšák 2013-01-08 14:32:41 +01:00
parent a60c567fcf
commit a75ddfd55d
2 changed files with 5 additions and 3 deletions

View file

@ -96,8 +96,8 @@
OUT_CS(CP_PACKET3(op, count))
#define OUT_CS_TABLE(values, count) do { \
memcpy(cs_copy->buf + cs_copy->cdw, values, count * 4); \
cs_copy->cdw += count; \
memcpy(cs_copy->buf + cs_copy->cdw, (values), (count) * 4); \
cs_copy->cdw += (count); \
CS_USED_DW(count); \
} while (0)

View file

@ -100,8 +100,10 @@ void r300_emit_dsa_state(struct r300_context* r300, unsigned size, void* state)
R300_FG_ALPHA_FUNC_CFG_3_OF_6;
}
BEGIN_CS(size);
OUT_CS_REG(R300_FG_ALPHA_FUNC, alpha_func);
WRITE_CS_TABLE(fb->zsbuf ? &dsa->cb_begin : dsa->cb_zb_no_readwrite, size-2);
OUT_CS_TABLE(fb->zsbuf ? &dsa->cb_begin : dsa->cb_zb_no_readwrite, 8);
END_CS;
}
static void get_rc_constant_state(