Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

[mesa.git] / src / mesa / drivers / dri / r600 / r700_chip.c

diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c
index 8538e3582b1cdd513935166a9b030a8a8ffe88bd..02c56b98d9b224a044a118583248c74fa9ab8149 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_chip.c
+++ b/src/mesa/drivers/dri/r600/r700_chip.c
@@ -1154,7 +1154,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;
                }