From 5692351264de9000b59b5eaab6e41f5fd547248d Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Mon, 6 May 2019 02:15:55 +0200 Subject: [PATCH] radv: Implement cosited_even sampling. Apparently cosited_even was the required one instead of midpoint. This adds slight offset of 0.5 pixels to the coordinates (+ we need the image size to convert to normalized coords) Fixes: 91702374d5d "radv: Add ycbcr lowering pass." Acked-by: Samuel Pitoiset --- src/amd/vulkan/radv_formats.c | 1 + .../vulkan/radv_nir_lower_ycbcr_textures.c | 84 ++++++++++++++++++- 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c index f6e50442009..9883002fa42 100644 --- a/src/amd/vulkan/radv_formats.c +++ b/src/amd/vulkan/radv_formats.c @@ -656,6 +656,7 @@ radv_physical_device_get_format_properties(struct radv_physical_device *physical uint32_t tiling = VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT | VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | + VK_FORMAT_FEATURE_COSITED_CHROMA_SAMPLES_BIT | VK_FORMAT_FEATURE_MIDPOINT_CHROMA_SAMPLES_BIT; /* The subsampled formats have no support for linear filters. */ diff --git a/src/amd/vulkan/radv_nir_lower_ycbcr_textures.c b/src/amd/vulkan/radv_nir_lower_ycbcr_textures.c index 77f2e6ac66e..5d771c2fc2e 100644 --- a/src/amd/vulkan/radv_nir_lower_ycbcr_textures.c +++ b/src/amd/vulkan/radv_nir_lower_ycbcr_textures.c @@ -156,6 +156,73 @@ convert_ycbcr(struct ycbcr_state *state, converted_channels[2], nir_imm_float(b, 1.0f)); } +static nir_ssa_def * +get_texture_size(struct ycbcr_state *state, nir_deref_instr *texture) +{ + nir_builder *b = state->builder; + const struct glsl_type *type = texture->type; + nir_tex_instr *tex = nir_tex_instr_create(b->shader, 1); + + tex->op = nir_texop_txs; + tex->sampler_dim = glsl_get_sampler_dim(type); + tex->is_array = glsl_sampler_type_is_array(type); + tex->is_shadow = glsl_sampler_type_is_shadow(type); + tex->dest_type = nir_type_int; + + tex->src[0].src_type = nir_tex_src_texture_deref; + tex->src[0].src = nir_src_for_ssa(&texture->dest.ssa); + + nir_ssa_dest_init(&tex->instr, &tex->dest, + nir_tex_instr_dest_size(tex), 32, NULL); + nir_builder_instr_insert(b, &tex->instr); + + return nir_i2f32(b, &tex->dest.ssa); +} + +static nir_ssa_def * +implicit_downsampled_coord(nir_builder *b, + nir_ssa_def *value, + nir_ssa_def *max_value, + int div_scale) +{ + return nir_fadd(b, + value, + nir_fdiv(b, + nir_imm_float(b, 1.0f), + nir_fmul(b, + nir_imm_float(b, div_scale), + max_value))); +} + +static nir_ssa_def * +implicit_downsampled_coords(struct ycbcr_state *state, + nir_ssa_def *old_coords) +{ + nir_builder *b = state->builder; + const struct radv_sampler_ycbcr_conversion *conversion = state->conversion; + nir_ssa_def *image_size = NULL; + nir_ssa_def *comp[4] = { NULL, }; + const struct vk_format_description *fmt_desc = vk_format_description(state->conversion->format); + const unsigned divisors[2] = {fmt_desc->width_divisor, fmt_desc->height_divisor}; + + for (int c = 0; c < old_coords->num_components; c++) { + if (c < ARRAY_SIZE(divisors) && divisors[c] > 1 && + conversion->chroma_offsets[c] == VK_CHROMA_LOCATION_COSITED_EVEN) { + if (!image_size) + image_size = get_texture_size(state, state->tex_deref); + + comp[c] = implicit_downsampled_coord(b, + nir_channel(b, old_coords, c), + nir_channel(b, image_size, c), + divisors[c]); + } else { + comp[c] = nir_channel(b, old_coords, c); + } + } + + return nir_vec(b, comp, old_coords->num_components); +} + static nir_ssa_def * create_plane_tex_instr_implicit(struct ycbcr_state *state, uint32_t plane) @@ -163,10 +230,23 @@ create_plane_tex_instr_implicit(struct ycbcr_state *state, nir_builder *b = state->builder; nir_tex_instr *old_tex = state->origin_tex; nir_tex_instr *tex = nir_tex_instr_create(b->shader, old_tex->num_srcs+ 1); - for (uint32_t i = 0; i < old_tex->num_srcs; i++) { tex->src[i].src_type = old_tex->src[i].src_type; - nir_src_copy(&tex->src[i].src, &old_tex->src[i].src, tex); + + switch (old_tex->src[i].src_type) { + case nir_tex_src_coord: + if (plane && true/*state->conversion->chroma_reconstruction*/) { + assert(old_tex->src[i].src.is_ssa); + tex->src[i].src = + nir_src_for_ssa(implicit_downsampled_coords(state, + old_tex->src[i].src.ssa)); + break; + } + /* fall through */ + default: + nir_src_copy(&tex->src[i].src, &old_tex->src[i].src, tex); + break; + } } tex->src[tex->num_srcs - 1].src = nir_src_for_ssa(nir_imm_int(b, plane)); -- 2.30.2