r600g: allocate FMASK right after the texture, so that it's aligned with it

This avoids the kernel CS checker errors with MSAA textures.

Reviewed-by: Jerome Glisse <jglisse@redhat.com>

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 484045ed4f03bb1d6728cd2b399215e70a73d69b..482559217bfe679333f900316a988884cd2b3f1f 100644 (file)
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -435,8 +435,8 @@ r600_texture_create_object(struct pipe_screen *screen,
        }
 
        if (base->nr_samples > 1 && !rtex->is_depth && !buf) {
-               r600_texture_allocate_cmask(rscreen, rtex);
                r600_texture_allocate_fmask(rscreen, rtex);
+               r600_texture_allocate_cmask(rscreen, rtex);
        }
 
        if (!rtex->is_depth && base->nr_samples > 1 &&