From: Dave Airlie <airlied@redhat.com>
Date: Mon, 18 Oct 2010 02:05:38 +0000 (+1000)
Subject: r600g: fix typo in tiling setup cb code.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=69f8eebe726d01d013f7cdea6c0d058ff6b04337;p=mesa.git

r600g: fix typo in tiling setup cb code.
---

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index a95e2c6590c..81d25b54203 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)