Mesa (master): r600g: fix typo in tiling setup cb code.

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 69f8eebe726d01d013f7cdea6c0d058ff6b04337
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=69f8eebe726d01d013f7cdea6c0d058ff6b04337

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Oct 18 12:05:38 2010 +1000

r600g: fix typo in tiling setup cb code.

---

 src/gallium/drivers/r600/r600_state.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index a95e2c6..81d25b5 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -974,7 +974,7 @@ static void r600_cb(struct r600_pipe_context *rctx, struct r600_pipe_state *rsta
 	swap = r600_translate_colorswap(rtex->resource.base.b.format);
 	color_info = S_0280A0_FORMAT(format) |
 		S_0280A0_COMP_SWAP(swap) |
-		S_0280A0_ARRAY_MODE(rtex->array_mode);
+		S_0280A0_ARRAY_MODE(rtex->array_mode) |
 		S_0280A0_BLEND_CLAMP(1) |
 		S_0280A0_NUMBER_TYPE(ntype);
 	if (desc->colorspace != UTIL_FORMAT_COLORSPACE_ZS)