[Mesa-dev] [PATCH] intel/blorp: Swizzle clear colors on the CPU

[Juan A. Suarez Romero]

On Wed, 2017-02-08 at 13:35 -0800, Jason Ekstrand wrote:
> This fixes the following Vulkan CTS tests on Haswell:
> 
> - dEQP-VK.api.image_clearing.clear_color_image.1d_b4g4r4a4_unorm_pack16
> - dEQP-VK.api.image_clearing.clear_color_image.2d_b4g4r4a4_unorm_pack16
> - dEQP-VK.api.image_clearing.clear_color_image.3d_b4g4r4a4_unorm_pack16
> ---


I've tried, and it still crashes in assertion:

deqp-vk: anv_private.h:1565: anv_swizzle_for_render: Assertion
`swizzle.a == ISL_CHANNEL_SELECT_ONE || swizzle.a ==
ISL_CHANNEL_SELECT_ALPHA' failed.


It seems it still requires patch from https://lists.freedesktop.org/arc
hives/mesa-dev/2017-February/143480.html


There's a small typo also in a comment.

Other than that, it is:

Reviewed-by: Juan A. Suarez Romero <jasuarez at igalia.com>.



BTW, I've also sent a couple of patches to fix these tests:

https://lists.freedesktop.org/archives/mesa-dev/2017-February/143479.ht
ml

Giving the above comment, I guess your preference is using patch 1/2
that I sent, and use this one you've sent instead of 2/2, right?


	J.A.


>  src/intel/blorp/blorp_clear.c | 45 ++++++++++++++++++++++++++-----------------
>  1 file changed, 27 insertions(+), 18 deletions(-)
> 
> diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c
> index 8ea22ac..e452713 100644
> --- a/src/intel/blorp/blorp_clear.c
> +++ b/src/intel/blorp/blorp_clear.c
> @@ -328,6 +328,23 @@ blorp_fast_clear(struct blorp_batch *batch,
>     batch->blorp->exec(batch, &params);
>  }
>  
> +static union isl_color_value
> +swizzle_color_value(union isl_color_value src, struct isl_swizzle swizzle)
> +{
> +   union isl_color_value dst;
> +
> +   assert((unsigned)(swizzle.r - ISL_CHANNEL_SELECT_RED) < 4);
> +   assert((unsigned)(swizzle.g - ISL_CHANNEL_SELECT_RED) < 4);
> +   assert((unsigned)(swizzle.b - ISL_CHANNEL_SELECT_RED) < 4);
> +   assert((unsigned)(swizzle.a - ISL_CHANNEL_SELECT_RED) < 4);
> +
> +   dst.u32[swizzle.r - ISL_CHANNEL_SELECT_RED] = src.u32[0];
> +   dst.u32[swizzle.g - ISL_CHANNEL_SELECT_RED] = src.u32[1];
> +   dst.u32[swizzle.b - ISL_CHANNEL_SELECT_RED] = src.u32[2];
> +   dst.u32[swizzle.a - ISL_CHANNEL_SELECT_RED] = src.u32[3];
> +
> +   return dst;
> +}
>  
>  void
>  blorp_clear(struct blorp_batch *batch,
> @@ -346,6 +363,14 @@ blorp_clear(struct blorp_batch *batch,
>     params.x1 = x1;
>     params.y1 = y1;
>  
> +   /* Manually apply the clear destination swizzle.  This way swizzled clears
> +    * will work for swizzles which we can't normally use for rendering and it
> +    * also ensures that they work on pre-Haswell hardware which can't swizlle
                                                                    ^^^
                                                          typo: swizzle
> +    * at all.
> +    */
> +   clear_color = swizzle_color_value(clear_color, swizzle);
> +   swizzle = ISL_SWIZZLE_IDENTITY;
> +
>     if (format == ISL_FORMAT_R9G9B9E5_SHAREDEXP) {
>        clear_color.u32[0] = float3_to_rgb9e5(clear_color.f32);
>        format = ISL_FORMAT_R32_UINT;
> @@ -353,24 +378,8 @@ blorp_clear(struct blorp_batch *batch,
>        /* Broadwell and earlier cannot render to this format so we need to work
>         * around it by swapping the colors around and using B4G4R4A4 instead.
>         */
> -
> -      /* First, we apply the swizzle. */
> -      union isl_color_value old;
> -      assert((unsigned)(swizzle.r - ISL_CHANNEL_SELECT_RED) < 4);
> -      assert((unsigned)(swizzle.g - ISL_CHANNEL_SELECT_RED) < 4);
> -      assert((unsigned)(swizzle.b - ISL_CHANNEL_SELECT_RED) < 4);
> -      assert((unsigned)(swizzle.a - ISL_CHANNEL_SELECT_RED) < 4);
> -      old.u32[swizzle.r - ISL_CHANNEL_SELECT_RED] = clear_color.u32[0];
> -      old.u32[swizzle.g - ISL_CHANNEL_SELECT_RED] = clear_color.u32[1];
> -      old.u32[swizzle.b - ISL_CHANNEL_SELECT_RED] = clear_color.u32[2];
> -      old.u32[swizzle.a - ISL_CHANNEL_SELECT_RED] = clear_color.u32[3];
> -      swizzle = ISL_SWIZZLE_IDENTITY;
> -
> -      /* Now we re-order for the new format */
> -      clear_color.u32[0] = old.u32[1];
> -      clear_color.u32[1] = old.u32[2];
> -      clear_color.u32[2] = old.u32[3];
> -      clear_color.u32[3] = old.u32[0];
> +      const struct isl_swizzle ARGB = ISL_SWIZZLE(ALPHA, RED, GREEN, BLUE);
> +      clear_color = swizzle_color_value(clear_color, ARGB);
>        format = ISL_FORMAT_B4G4R4A4_UNORM;
>     }
>