From 8ff4be44b727ccd4452f426391c8a05b264e30dc Mon Sep 17 00:00:00 2001 From: Johnson Lin Date: Fri, 16 Jun 2017 13:40:31 +0800 Subject: [PATCH] nir: Add a lowering pass for UYVY textures Similar with support for YUYV but with byte order difference in sampler Reviewed-by: Kristian H. Kristensen --- src/compiler/nir/nir.h | 1 + src/compiler/nir/nir_lower_tex.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index ab7ba14..1b4e470 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -2449,6 +2449,7 @@ typedef struct nir_lower_tex_options { unsigned lower_y_uv_external; unsigned lower_y_u_v_external; unsigned lower_yx_xuxv_external; + unsigned lower_xy_uxvx_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 4ef8195..65681de 100644 --- a/src/compiler/nir/nir_lower_tex.c +++ b/src/compiler/nir/nir_lower_tex.c @@ -301,6 +301,20 @@ lower_yx_xuxv_external(nir_builder *b, nir_tex_instr *tex) nir_channel(b, xuxv, 3)); } +static void +lower_xy_uxvx_external(nir_builder *b, nir_tex_instr *tex) +{ + b->cursor = nir_after_instr(&tex->instr); + + nir_ssa_def *y = sample_plane(b, tex, 0); + nir_ssa_def *uxvx = sample_plane(b, tex, 1); + + convert_yuv_to_rgb(b, tex, + nir_channel(b, y, 1), + nir_channel(b, uxvx, 0), + nir_channel(b, uxvx, 2)); +} + /* * Emits a textureLod operation used to replace an existing * textureGrad instruction. @@ -760,6 +774,10 @@ nir_lower_tex_block(nir_block *block, nir_builder *b, progress = true; } + if ((1 << tex->texture_index) & options->lower_xy_uxvx_external) { + lower_xy_uxvx_external(b, tex); + progress = true; + } if (sat_mask) { saturate_src(b, tex, sat_mask); -- 2.7.4