nir/lower_tex: Add support for XYUV lowering

The memory layout associated with this format would be:
Byte:      0 1 2 3
Component: V U Y X

Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 190b7af7c28f55bc3a4f934a3d49722148fa31bd..3403f841939cc552553952bdc8fb9fe92a26fe84 100644 (file)
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -3058,6 +3058,7 @@ typedef struct nir_lower_tex_options {
    unsigned lower_yx_xuxv_external;
    unsigned lower_xy_uxvx_external;
    unsigned lower_ayuv_external;
+   unsigned lower_xyuv_external;
 
    /**
     * To emulate certain texture wrap modes, this can be used

diff --git a/src/compiler/nir/nir_lower_tex.c b/src/compiler/nir/nir_lower_tex.c
index c9fe0d74f6c22c84062eb0c36c7abcec566416d6..7c6eafed2f95902338570ac321f7ec5963a21b6f 100644 (file)
--- a/src/compiler/nir/nir_lower_tex.c
+++ b/src/compiler/nir/nir_lower_tex.c
@@ -451,6 +451,21 @@ lower_ayuv_external(nir_builder *b, nir_tex_instr *tex,
                      nir_channel(b, ayuv, 3));
 }
 
+static void
+lower_xyuv_external(nir_builder *b, nir_tex_instr *tex,
+                    const nir_lower_tex_options *options)
+{
+  b->cursor = nir_after_instr(&tex->instr);
+
+  nir_ssa_def *xyuv = sample_plane(b, tex, 0, options);
+
+  convert_yuv_to_rgb(b, tex,
+                     nir_channel(b, xyuv, 2),
+                     nir_channel(b, xyuv, 1),
+                     nir_channel(b, xyuv, 0),
+                     nir_imm_float(b, 1.0f));
+}
+
 /*
  * Converts a nir_texop_txd instruction to nir_texop_txl with the given lod
  * computed from the gradients.
@@ -958,6 +973,11 @@ nir_lower_tex_block(nir_block *block, nir_builder *b,
          progress = true;
       }
 
+      if ((1 << tex->texture_index) & options->lower_xyuv_external) {
+         lower_xyuv_external(b, tex, options);
+         progress = true;
+      }
+
       if (sat_mask) {
          saturate_src(b, tex, sat_mask);
          progress = true;