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

[Marek Olšák]

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Mar  3 14:54:31 2013 +0100

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 at redhat.com>

---

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

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 484045e..4825592 100644
--- 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 &&