diff options
| author | Brian Paul <[email protected]> | 2009-12-11 09:22:00 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-12-11 09:22:00 -0700 |
| commit | b605f4ff11c894500f2d0273c5d4653ff413448d (patch) | |
| tree | 144a2202677b29020bfb0477d145a985cae3c29f /src/mesa/drivers | |
| parent | da3bc492d2438ac915e720c17b54d0d12ffd8a97 (diff) | |
| parent | 5076a4f53a2f34cc9116b45951037f639885c7a1 (diff) | |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_debug.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_chip.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_debug.c b/src/mesa/drivers/dri/i915/i915_debug.c index f7bb7ea44c9..fecfac30339 100644 --- a/src/mesa/drivers/dri/i915/i915_debug.c +++ b/src/mesa/drivers/dri/i915/i915_debug.c @@ -806,6 +806,7 @@ static GLboolean i915_debug_packet( struct debug_stream *stream ) default: return debug(stream, "", 0); } + break; default: assert(0); return 0; diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c index 8538e3582b1..02c56b98d9b 100644 --- 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; } |