From: Jonathan Marek <jonathan@marek.ca>
Date: Fri, 10 Apr 2020 12:37:48 +0000 (-0400)
Subject: nir: convert_ycbcr: preserve alpha channel
X-Git-Tag: upstream/20.1.8~1076
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71820c6b02d71e40d413e2d080e87108e64cfeeb;p=platform%2Fupstream%2Fmesa.git

nir: convert_ycbcr: preserve alpha channel

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: D Scott Phillips <d.scott.phillips@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4528>
---

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));
 }