<div dir="auto">Reviewed-by: Bas Nieuwenhuizen <<a href="mailto:bas@basnieuwenhuizen.nl">bas@basnieuwenhuizen.nl</a>><div dir="auto"><br></div></div><br><div class="gmail_quote"><div dir="ltr">On Tue, 27 Mar 2018, 10:08 Samuel Pitoiset, <<a href="mailto:samuel.pitoiset@gmail.com">samuel.pitoiset@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Tested-by: Samuel Pitoiset <<a href="mailto:samuel.pitoiset@gmail.com" target="_blank" rel="noreferrer">samuel.pitoiset@gmail.com</a>><br>
<br>
On 03/27/2018 02:39 AM, Marek Olšák wrote:<br>
> From: Marek Olšák <<a href="mailto:marek.olsak@amd.com" target="_blank" rel="noreferrer">marek.olsak@amd.com</a>><br>
><br>
> Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=105738" rel="noreferrer noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=105738</a><br>
> ---<br>
>   src/amd/common/ac_surface.c | 8 ++++++++<br>
>   1 file changed, 8 insertions(+)<br>
><br>
> diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c<br>
> index 12dfc0cb1f2..81882576baf 100644<br>
> --- a/src/amd/common/ac_surface.c<br>
> +++ b/src/amd/common/ac_surface.c<br>
> @@ -1150,32 +1150,39 @@ static int gfx9_compute_surface(ADDR_HANDLE addrlib,<br>
>                       break;<br>
>               case 16:<br>
>                       AddrSurfInfoIn.format = ADDR_FMT_BC3;<br>
>                       break;<br>
>               default:<br>
>                       assert(0);<br>
>               }<br>
>       } else {<br>
>               switch (surf->bpe) {<br>
>               case 1:<br>
> +                     assert(!(surf->flags & RADEON_SURF_ZBUFFER));<br>
>                       AddrSurfInfoIn.format = ADDR_FMT_8;<br>
>                       break;<br>
>               case 2:<br>
> +                     assert(surf->flags & RADEON_SURF_ZBUFFER ||<br>
> +                            !(surf->flags & RADEON_SURF_SBUFFER));<br>
>                       AddrSurfInfoIn.format = ADDR_FMT_16;<br>
>                       break;<br>
>               case 4:<br>
> +                     assert(surf->flags & RADEON_SURF_ZBUFFER ||<br>
> +                            !(surf->flags & RADEON_SURF_SBUFFER));<br>
>                       AddrSurfInfoIn.format = ADDR_FMT_32;<br>
>                       break;<br>
>               case 8:<br>
> +                     assert(!(surf->flags & RADEON_SURF_Z_OR_SBUFFER));<br>
>                       AddrSurfInfoIn.format = ADDR_FMT_32_32;<br>
>                       break;<br>
>               case 16:<br>
> +                     assert(!(surf->flags & RADEON_SURF_Z_OR_SBUFFER));<br>
>                       AddrSurfInfoIn.format = ADDR_FMT_32_32_32_32;<br>
>                       break;<br>
>               default:<br>
>                       assert(0);<br>
>               }<br>
>               AddrSurfInfoIn.bpp = surf->bpe * 8;<br>
>       }<br>
><br>
>       AddrSurfInfoIn.flags.color = !(surf->flags & RADEON_SURF_Z_OR_SBUFFER);<br>
>       AddrSurfInfoIn.flags.depth = (surf->flags & RADEON_SURF_ZBUFFER) != 0;<br>
> @@ -1251,20 +1258,21 @@ static int gfx9_compute_surface(ADDR_HANDLE addrlib,<br>
>       /* Calculate texture layout information. */<br>
>       r = gfx9_compute_miptree(addrlib, config, surf, compressed,<br>
>                                &AddrSurfInfoIn);<br>
>       if (r)<br>
>               return r;<br>
><br>
>       /* Calculate texture layout information for stencil. */<br>
>       if (surf->flags & RADEON_SURF_SBUFFER) {<br>
>               AddrSurfInfoIn.flags.stencil = 1;<br>
>               AddrSurfInfoIn.bpp = 8;<br>
> +             AddrSurfInfoIn.format = ADDR_FMT_8;<br>
><br>
>               if (!AddrSurfInfoIn.flags.depth) {<br>
>                       r = gfx9_get_preferred_swizzle_mode(addrlib, &AddrSurfInfoIn, false,<br>
>                                                           &AddrSurfInfoIn.swizzleMode);<br>
>                       if (r)<br>
>                               return r;<br>
>               } else<br>
>                       AddrSurfInfoIn.flags.depth = 0;<br>
><br>
>               r = gfx9_compute_miptree(addrlib, config, surf, compressed,<br>
><br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank" rel="noreferrer">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</blockquote></div>