Mesa (master): radv: use common nir_convert_ycbcr
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Apr 20 23:00:21 UTC 2020
Module: Mesa
Branch: master
Commit: 064d39e620f0dfd45dbdcea798e266464f769c8f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=064d39e620f0dfd45dbdcea798e266464f769c8f
Author: Jonathan Marek <jonathan at marek.ca>
Date: Sun Apr 12 10:53:07 2020 -0400
radv: use common nir_convert_ycbcr
Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Acked-by: Jason Ekstrand <jason at jlekstrand.net>
Reviewed-by: D Scott Phillips <d.scott.phillips at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4528>
---
src/amd/vulkan/radv_nir_lower_ycbcr_textures.c | 131 ++-----------------------
1 file changed, 9 insertions(+), 122 deletions(-)
diff --git a/src/amd/vulkan/radv_nir_lower_ycbcr_textures.c b/src/amd/vulkan/radv_nir_lower_ycbcr_textures.c
index 2b84ddae2a0..190964a4de3 100644
--- a/src/amd/vulkan/radv_nir_lower_ycbcr_textures.c
+++ b/src/amd/vulkan/radv_nir_lower_ycbcr_textures.c
@@ -26,6 +26,7 @@
#include "vk_format.h"
#include "nir/nir.h"
#include "nir/nir_builder.h"
+#include "nir/nir_vulkan.h"
struct ycbcr_state {
nir_builder *builder;
@@ -35,127 +36,6 @@ struct ycbcr_state {
const struct radv_sampler_ycbcr_conversion *conversion;
};
-static nir_ssa_def *
-y_range(nir_builder *b,
- nir_ssa_def *y_channel,
- int bpc,
- VkSamplerYcbcrRange range)
-{
- switch (range) {
- case VK_SAMPLER_YCBCR_RANGE_ITU_FULL:
- return y_channel;
- case VK_SAMPLER_YCBCR_RANGE_ITU_NARROW:
- return nir_fmul(b,
- nir_fadd(b,
- nir_fmul(b, y_channel,
- nir_imm_float(b, pow(2, bpc) - 1)),
- nir_imm_float(b, -16.0f * pow(2, bpc - 8))),
- nir_frcp(b, nir_imm_float(b, 219.0f * pow(2, bpc - 8))));
- default:
- unreachable("missing Ycbcr range");
- return NULL;
- }
-}
-
-static nir_ssa_def *
-chroma_range(nir_builder *b,
- nir_ssa_def *chroma_channel,
- int bpc,
- VkSamplerYcbcrRange range)
-{
- switch (range) {
- case VK_SAMPLER_YCBCR_RANGE_ITU_FULL:
- return nir_fadd(b, chroma_channel,
- nir_imm_float(b, -pow(2, bpc - 1) / (pow(2, bpc) - 1.0f)));
- case VK_SAMPLER_YCBCR_RANGE_ITU_NARROW:
- return nir_fmul(b,
- nir_fadd(b,
- nir_fmul(b, chroma_channel,
- nir_imm_float(b, pow(2, bpc) - 1)),
- nir_imm_float(b, -128.0f * pow(2, bpc - 8))),
- nir_frcp(b, nir_imm_float(b, 224.0f * pow(2, bpc - 8))));
- default:
- unreachable("missing Ycbcr range");
- return NULL;
- }
-}
-
-typedef struct nir_const_value_3_4 {
- nir_const_value v[3][4];
-} nir_const_value_3_4;
-
-static const nir_const_value_3_4 *
-ycbcr_model_to_rgb_matrix(VkSamplerYcbcrModelConversion model)
-{
- switch (model) {
- case VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_601: {
- static const nir_const_value_3_4 bt601 = { {
- { { .f32 = 1.402f }, { .f32 = 1.0f }, { .f32 = 0.0f }, { .f32 = 0.0f } },
- { { .f32 = -0.714136286201022f }, { .f32 = 1.0f }, { .f32 = -0.344136286201022f }, { .f32 = 0.0f } },
- { { .f32 = 0.0f }, { .f32 = 1.0f }, { .f32 = 1.772f }, { .f32 = 0.0f } },
- } };
-
- return &bt601;
- }
- case VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_709: {
- static const nir_const_value_3_4 bt709 = { {
- { { .f32 = 1.5748031496063f }, { .f32 = 1.0f }, { .f32 = 0.0f }, { .f32 = 0.0f } },
- { { .f32 = -0.468125209181067f }, { .f32 = 1.0f }, { .f32 = -0.187327487470334f }, { .f32 = 0.0f } },
- { { .f32 = 0.0f }, { .f32 = 1.0f }, { .f32 = 1.85563184264242f }, { .f32 = 0.0f } },
- } };
-
- return &bt709;
- }
- case VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020: {
- static const nir_const_value_3_4 bt2020 = { {
- { { .f32 = 1.4746f }, { .f32 = 1.0f }, { .f32 = 0.0f }, { .f32 = 0.0f } },
- { { .f32 = -0.571353126843658f }, { .f32 = 1.0f }, { .f32 = -0.164553126843658f }, { .f32 = 0.0f } },
- { { .f32 = 0.0f }, { .f32 = 1.0f }, { .f32 = 1.8814f }, { .f32 = 0.0f } },
- } };
-
- return &bt2020;
- }
- default:
- unreachable("missing Ycbcr model");
- return NULL;
- }
-}
-
-static nir_ssa_def *
-convert_ycbcr(struct ycbcr_state *state,
- nir_ssa_def *raw_channels,
- uint8_t bits)
-{
- nir_builder *b = state->builder;
- const struct radv_sampler_ycbcr_conversion *conversion = state->conversion;
-
- nir_ssa_def *expanded_channels =
- nir_vec4(b,
- chroma_range(b, nir_channel(b, raw_channels, 0),
- bits, conversion->ycbcr_range),
- y_range(b, nir_channel(b, raw_channels, 1),
- bits, conversion->ycbcr_range),
- chroma_range(b, nir_channel(b, raw_channels, 2),
- bits, conversion->ycbcr_range),
- nir_imm_float(b, 1.0f));
-
- if (conversion->ycbcr_model == VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_IDENTITY)
- return expanded_channels;
-
- const nir_const_value_3_4 *conversion_matrix =
- ycbcr_model_to_rgb_matrix(conversion->ycbcr_model);
-
- nir_ssa_def *converted_channels[] = {
- nir_fdot4(b, expanded_channels, nir_build_imm(b, 4, 32, conversion_matrix->v[0])),
- nir_fdot4(b, expanded_channels, nir_build_imm(b, 4, 32, conversion_matrix->v[1])),
- nir_fdot4(b, expanded_channels, nir_build_imm(b, 4, 32, conversion_matrix->v[2]))
- };
-
- return nir_vec4(b,
- converted_channels[0], converted_channels[1],
- converted_channels[2], nir_imm_float(b, 1.0f));
-}
-
static nir_ssa_def *
get_texture_size(struct ycbcr_state *state, nir_deref_instr *texture)
{
@@ -405,7 +285,14 @@ try_lower_tex_ycbcr(const struct radv_pipeline_layout *layout,
nir_ssa_def *result = build_swizzled_components(builder, format, ycbcr_sampler->components, plane_values);
if (state.conversion->ycbcr_model != VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY) {
VkFormat first_format = vk_format_get_plane_format(format, 0);
- result = convert_ycbcr(&state, result, vk_format_get_component_bits(first_format, VK_FORMAT_COLORSPACE_RGB, VK_SWIZZLE_X));
+ uint32_t bits = vk_format_get_component_bits(first_format, VK_FORMAT_COLORSPACE_RGB, VK_SWIZZLE_X);
+ /* TODO: swizzle and bpcs */
+ uint32_t bpcs[3] = {bits, bits, bits};
+ result = nir_convert_ycbcr_to_rgb(builder,
+ state.conversion->ycbcr_model,
+ state.conversion->ycbcr_range,
+ result,
+ bpcs);
}
nir_ssa_def_rewrite_uses(&tex->dest.ssa, nir_src_for_ssa(result));
More information about the mesa-commit
mailing list