From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Sat, 21 Jan 2017 17:34:44 +0000 (-0800)
Subject: intel/blorp: Silently convert RGBX destination formats to RGBA
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4e26e3dea9d11b2fe88d829488e1295161e68cbb;p=mesa.git

intel/blorp: Silently convert RGBX destination formats to RGBA

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
---

diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c
index 8b64cd7bad2..cd2d3b43157 100644
--- a/src/intel/blorp/blorp_blit.c
+++ b/src/intel/blorp/blorp_blit.c
@@ -1896,6 +1896,10 @@ try_blorp_blit(struct blorp_batch *batch,
 
       wm_prog_key->dst_rgb = true;
       wm_prog_key->need_dst_offset = true;
+   } else if (isl_format_is_rgbx(params->dst.view.format)) {
+      /* We can handle RGBX formats easily enough by treating them as RGBA */
+      params->dst.view.format =
+         isl_format_rgbx_to_rgba(params->dst.view.format);
    } else if (params->dst.view.format == ISL_FORMAT_R24_UNORM_X8_TYPELESS) {
       wm_prog_key->dst_format = params->dst.view.format;
       params->dst.view.format = ISL_FORMAT_R32_UNORM;