r600g: fix typo in tiling setup cb code.
authorDave Airlie <airlied@redhat.com>
Mon, 18 Oct 2010 02:05:38 +0000 (12:05 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 18 Oct 2010 03:39:55 +0000 (13:39 +1000)
src/gallium/drivers/r600/r600_state.c

index a95e2c6590c2d92a52f6ff5ad40336f0ab27f1b8..81d25b5420309681e60d3de9f19fcf5ca9e68d0d 100644 (file)
@@ -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)