diff options
author | Andre Maasikas <amaasikas@gmail.com> | 2009-12-08 10:16:14 +0200 |
---|---|---|
committer | Andre Maasikas <amaasikas@gmail.com> | 2009-12-08 10:16:14 +0200 |
commit | 0d4a05445c6b47b93269a3829afbe509ffec4817 (patch) | |
tree | 20bf88dcabe25cea87e1e084420111875f17ad72 /src/mesa/drivers/dri/r600/r700_chip.c | |
parent | ba167f812c44c4bb8c8f844c3d5fbff60bfc93eb (diff) | |
parent | 369669ff9a7ff7636cadef8e2b13f2f28face98f (diff) |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Diffstat (limited to 'src/mesa/drivers/dri/r600/r700_chip.c')
-rw-r--r-- | src/mesa/drivers/dri/r600/r700_chip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c index 2b2b4d748f..8538e3582b 100644 --- a/src/mesa/drivers/dri/r600/r700_chip.c +++ b/src/mesa/drivers/dri/r600/r700_chip.c @@ -1297,9 +1297,9 @@ void r600InitAtoms(context_t *context) ALLOC_STATE(poly, always, 10, r700SendPolyState); ALLOC_STATE(cb, cb, 18, r700SendCBState); ALLOC_STATE(clrcmp, always, 6, r700SendCBCLRCMPState); + ALLOC_STATE(cb_target, always, 25, r700SendRenderTargetState); ALLOC_STATE(blnd, blnd, (6 + (R700_MAX_RENDER_TARGETS * 3)), r700SendCBBlendState); ALLOC_STATE(blnd_clr, always, 6, r700SendCBBlendColorState); - ALLOC_STATE(cb_target, always, 25, r700SendRenderTargetState); ALLOC_STATE(sx, always, 9, r700SendSXState); ALLOC_STATE(vgt, always, 41, r700SendVGTState); ALLOC_STATE(spi, always, (59 + R700_MAX_SHADER_EXPORTS), r700SendSPIState); |