From 71820c6b02d71e40d413e2d080e87108e64cfeeb Mon Sep 17 00:00:00 2001 From: Jonathan Marek Date: Fri, 10 Apr 2020 08:37:48 -0400 Subject: [PATCH] nir: convert_ycbcr: preserve alpha channel Signed-off-by: Jonathan Marek Reviewed-by: Bas Nieuwenhuizen Reviewed-by: D Scott Phillips Reviewed-by: Lionel Landwerlin Part-of: --- src/compiler/nir/nir_convert_ycbcr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/nir/nir_convert_ycbcr.c b/src/compiler/nir/nir_convert_ycbcr.c index fdd6cf1..2a11169 100644 --- a/src/compiler/nir/nir_convert_ycbcr.c +++ b/src/compiler/nir/nir_convert_ycbcr.c @@ -122,7 +122,7 @@ nir_convert_ycbcr_to_rgb(nir_builder *b, chroma_range(b, nir_channel(b, raw_channels, 0), bpcs[0], range), y_range(b, nir_channel(b, raw_channels, 1), bpcs[1], range), chroma_range(b, nir_channel(b, raw_channels, 2), bpcs[2], range), - nir_imm_float(b, 1.0f)); + nir_channel(b, raw_channels, 3)); if (model == VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_IDENTITY) return expanded_channels; @@ -138,5 +138,5 @@ nir_convert_ycbcr_to_rgb(nir_builder *b, return nir_vec4(b, converted_channels[0], converted_channels[1], - converted_channels[2], nir_imm_float(b, 1.0f)); + converted_channels[2], nir_channel(b, raw_channels, 3)); } -- 2.7.4