Mesa (mesa_7_6_branch): r600: fix state size prediction after dc0777d3

Andre Maasikas andrem at kemper.freedesktop.org
Wed Dec 9 02:07:58 PST 2009


Module: Mesa
Branch: mesa_7_6_branch
Commit: 33a120e4761a661736ea64a3efc2e3831ac5600a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=33a120e4761a661736ea64a3efc2e3831ac5600a

Author: Andre Maasikas <amaasikas at gmail.com>
Date:   Wed Dec  9 10:51:52 2009 +0200

r600: fix state size prediction after dc0777d3

---

 src/mesa/drivers/dri/r600/r700_chip.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c
index d8661b4..dacc2cc 100644
--- a/src/mesa/drivers/dri/r600/r700_chip.c
+++ b/src/mesa/drivers/dri/r600/r700_chip.c
@@ -1134,7 +1134,11 @@ static int check_blnd(GLcontext *ctx, struct radeon_state_atom *atom)
 		count += 3;
 
 	if (context->radeon.radeonScreen->chip_family > CHIP_FAMILY_R600) {
-		for (ui = 0; ui < R700_MAX_RENDER_TARGETS; ui++) {
+		/* targets are enabled in r700SetRenderTarget but state
+		   size is calculated before that. Until MRT's are done
+		   hardcode target0 as enabled. */
+		count += 3;
+		for (ui = 1; ui < R700_MAX_RENDER_TARGETS; ui++) {
                         if (r700->render_target[ui].enabled)
 				count += 3;
 		}



More information about the mesa-commit mailing list