[Mesa-dev] [PATCH 09/17] intel/isl/gen7: Don't allow multisampled surfaces with valign2

[Jason Ekstrand]

6-9 are

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

On Fri, Jul 21, 2017 at 8:01 AM, Topi Pohjolainen <
topi.pohjolainen at gmail.com> wrote:

> There is the same constraintg later on as assert in
> isl_gen7_choose_image_alignment_el() so catch it earlier in order
> to return error instead of crash.
>
> Needed to avoid crashes with piglits on IVB and HSW:
>
> arb_internalformat_query2.image_format_compatibility_type pname checks
> arb_internalformat_query2.all internalformat_<x>_type pname checks
> arb_internalformat_query2.max dimensions related pname checks
> arb_copy_image.arb_copy_image-formats --samples=2/4/6/8
> arb_texture_float.multisample-fast-clear gl_arb_texture_float
>
> Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
> ---
>  src/intel/isl/isl_gen7.c | 42 +++++++++++++++++++++++-------------------
>  1 file changed, 23 insertions(+), 19 deletions(-)
>
> diff --git a/src/intel/isl/isl_gen7.c b/src/intel/isl/isl_gen7.c
> index ab47a7f622..24d411f51e 100644
> --- a/src/intel/isl/isl_gen7.c
> +++ b/src/intel/isl/isl_gen7.c
> @@ -24,6 +24,25 @@
>  #include "isl_gen7.h"
>  #include "isl_priv.h"
>
> +static bool
> +gen7_format_needs_valign2(const struct isl_device *dev,
> +                          enum isl_format format)
> +{
> +   assert(ISL_DEV_GEN(dev) == 7);
> +
> +   /* From the Ivybridge PRM (2012-05-31), Volume 4, Part 1, Section
> 2.12.1,
> +    * RENDER_SURFACE_STATE Surface Vertical Alignment:
> +    *
> +    *    - Value of 1 [VALIGN_4] is not supported for format YCRCB_NORMAL
> +    *      (0x182), YCRCB_SWAPUVY (0x183), YCRCB_SWAPUV (0x18f),
> YCRCB_SWAPY
> +    *      (0x190)
> +    *
> +    *    - VALIGN_4 is not supported for surface format R32G32B32_FLOAT.
> +    */
> +   return isl_format_is_yuv(format) ||
> +          format == ISL_FORMAT_R32G32B32_FLOAT;
> +}
> +
>  bool
>  isl_gen7_choose_msaa_layout(const struct isl_device *dev,
>                              const struct isl_surf_init_info *info,
> @@ -81,6 +100,10 @@ isl_gen7_choose_msaa_layout(const struct isl_device
> *dev,
>      * surfaces with RGBA8I, RGBA16I and RGBA32I.
>      */
>
> +   /* Multisampling requires vertical alignment of four. */
> +   if (info->samples > 1 && gen7_format_needs_valign2(dev, info->format))
> +      return false;
> +
>     /* More obvious restrictions */
>     if (isl_surf_usage_is_display(info->usage))
>        return false;
> @@ -152,25 +175,6 @@ isl_gen7_choose_msaa_layout(const struct isl_device
> *dev,
>     return true;
>  }
>
> -static bool
> -gen7_format_needs_valign2(const struct isl_device *dev,
> -                          enum isl_format format)
> -{
> -   assert(ISL_DEV_GEN(dev) == 7);
> -
> -   /* From the Ivybridge PRM (2012-05-31), Volume 4, Part 1, Section
> 2.12.1,
> -    * RENDER_SURFACE_STATE Surface Vertical Alignment:
> -    *
> -    *    - Value of 1 [VALIGN_4] is not supported for format YCRCB_NORMAL
> -    *      (0x182), YCRCB_SWAPUVY (0x183), YCRCB_SWAPUV (0x18f),
> YCRCB_SWAPY
> -    *      (0x190)
> -    *
> -    *    - VALIGN_4 is not supported for surface format R32G32B32_FLOAT.
> -    */
> -   return isl_format_is_yuv(format) ||
> -          format == ISL_FORMAT_R32G32B32_FLOAT;
> -}
> -
>  /**
>   * @brief Filter out tiling flags that are incompatible with the surface.
>   *
> --
> 2.11.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170721/92615825/attachment.html>