Re: [Mesa-dev] [PATCH] r600g: allocate FMASK right after the texture, so that it's aligned with it

2013-03-04 Thread Jerome Glisse 
On Sun, Mar 3, 2013 at 9:13 AM, Marek Olšák  wrote:
> This avoids the kernel CS checker errors with MSAA textures.

Reviewed-by: Jerome Glisse 

> ---
>  src/gallium/drivers/r600/r600_texture.c |2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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 &&
> --
> 1.7.10.4
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] r600g: allocate FMASK right after the texture, so that it's aligned with it

2013-03-03 Thread Marek Olšák 
This avoids the kernel CS checker errors with MSAA textures.
---
 src/gallium/drivers/r600/r600_texture.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 &&
-- 
1.7.10.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev