From 15e5a7a6832bba011564bfa2045fba9e833eede2 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sun, 6 Aug 2017 01:56:17 +0200 Subject: [PATCH] radv: Only convert linear->srgb in compute resolves. It justs works with the fragment shader resolve, so no need to do a custom conversion. In fact with SRGB dest, it actually gives wrong results. Fixes: 69136f4e633 "radv/meta: add resolve pass using fragment/vertex shaders" Reviewed-by: Dave Airlie --- src/amd/vulkan/radv_meta.c | 46 --------------------------- src/amd/vulkan/radv_meta.h | 1 - src/amd/vulkan/radv_meta_resolve_cs.c | 46 +++++++++++++++++++++++++-- src/amd/vulkan/radv_meta_resolve_fs.c | 38 ++++++---------------- src/amd/vulkan/radv_private.h | 2 -- 5 files changed, 54 insertions(+), 79 deletions(-) diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c index 263181a57f2..af56f493b42 100644 --- a/src/amd/vulkan/radv_meta.c +++ b/src/amd/vulkan/radv_meta.c @@ -477,48 +477,8 @@ radv_meta_build_nir_fs_noop(void) return b.shader; } -static nir_ssa_def *radv_meta_build_resolve_srgb_conversion(nir_builder *b, - nir_ssa_def *input) -{ - nir_const_value v; - unsigned i; - v.u32[0] = 0x3b4d2e1c; // 0.00313080009 - - nir_ssa_def *cmp[3]; - for (i = 0; i < 3; i++) - cmp[i] = nir_flt(b, nir_channel(b, input, i), - nir_build_imm(b, 1, 32, v)); - - nir_ssa_def *ltvals[3]; - v.f32[0] = 12.92; - for (i = 0; i < 3; i++) - ltvals[i] = nir_fmul(b, nir_channel(b, input, i), - nir_build_imm(b, 1, 32, v)); - - nir_ssa_def *gtvals[3]; - - for (i = 0; i < 3; i++) { - v.f32[0] = 1.0/2.4; - gtvals[i] = nir_fpow(b, nir_channel(b, input, i), - nir_build_imm(b, 1, 32, v)); - v.f32[0] = 1.055; - gtvals[i] = nir_fmul(b, gtvals[i], - nir_build_imm(b, 1, 32, v)); - v.f32[0] = 0.055; - gtvals[i] = nir_fsub(b, gtvals[i], - nir_build_imm(b, 1, 32, v)); - } - - nir_ssa_def *comp[4]; - for (i = 0; i < 3; i++) - comp[i] = nir_bcsel(b, cmp[i], ltvals[i], gtvals[i]); - comp[3] = nir_channels(b, input, 3); - return nir_vec(b, comp, 4); -} - void radv_meta_build_resolve_shader_core(nir_builder *b, bool is_integer, - bool is_srgb, int samples, nir_variable *input_img, nir_variable *color, @@ -596,10 +556,4 @@ void radv_meta_build_resolve_shader_core(nir_builder *b, if (outer_if) b->cursor = nir_after_cf_node(&outer_if->cf_node); - - if (is_srgb) { - nir_ssa_def *newv = nir_load_var(b, color); - newv = radv_meta_build_resolve_srgb_conversion(b, newv); - nir_store_var(b, color, newv, 0xf); - } } diff --git a/src/amd/vulkan/radv_meta.h b/src/amd/vulkan/radv_meta.h index c4a81a25945..adc889bf4e2 100644 --- a/src/amd/vulkan/radv_meta.h +++ b/src/amd/vulkan/radv_meta.h @@ -234,7 +234,6 @@ nir_shader *radv_meta_build_nir_fs_noop(void); void radv_meta_build_resolve_shader_core(nir_builder *b, bool is_integer, - bool is_srgb, int samples, nir_variable *input_img, nir_variable *color, diff --git a/src/amd/vulkan/radv_meta_resolve_cs.c b/src/amd/vulkan/radv_meta_resolve_cs.c index 832ae7b8c99..f13e79ef0ce 100644 --- a/src/amd/vulkan/radv_meta_resolve_cs.c +++ b/src/amd/vulkan/radv_meta_resolve_cs.c @@ -31,6 +31,45 @@ #include "sid.h" #include "vk_format.h" +static nir_ssa_def *radv_meta_build_resolve_srgb_conversion(nir_builder *b, + nir_ssa_def *input) +{ + nir_const_value v; + unsigned i; + v.u32[0] = 0x3b4d2e1c; // 0.00313080009 + + nir_ssa_def *cmp[3]; + for (i = 0; i < 3; i++) + cmp[i] = nir_flt(b, nir_channel(b, input, i), + nir_build_imm(b, 1, 32, v)); + + nir_ssa_def *ltvals[3]; + v.f32[0] = 12.92; + for (i = 0; i < 3; i++) + ltvals[i] = nir_fmul(b, nir_channel(b, input, i), + nir_build_imm(b, 1, 32, v)); + + nir_ssa_def *gtvals[3]; + + for (i = 0; i < 3; i++) { + v.f32[0] = 1.0/2.4; + gtvals[i] = nir_fpow(b, nir_channel(b, input, i), + nir_build_imm(b, 1, 32, v)); + v.f32[0] = 1.055; + gtvals[i] = nir_fmul(b, gtvals[i], + nir_build_imm(b, 1, 32, v)); + v.f32[0] = 0.055; + gtvals[i] = nir_fsub(b, gtvals[i], + nir_build_imm(b, 1, 32, v)); + } + + nir_ssa_def *comp[4]; + for (i = 0; i < 3; i++) + comp[i] = nir_bcsel(b, cmp[i], ltvals[i], gtvals[i]); + comp[3] = nir_channels(b, input, 3); + return nir_vec(b, comp, 4); +} + static nir_shader * build_resolve_compute_shader(struct radv_device *dev, bool is_integer, bool is_srgb, int samples) { @@ -88,10 +127,13 @@ build_resolve_compute_shader(struct radv_device *dev, bool is_integer, bool is_s nir_ssa_def *img_coord = nir_channels(&b, nir_iadd(&b, global_id, &src_offset->dest.ssa), 0x3); nir_variable *color = nir_local_variable_create(b.impl, glsl_vec4_type(), "color"); - radv_meta_build_resolve_shader_core(&b, is_integer, is_srgb, samples, - input_img, color, img_coord); + radv_meta_build_resolve_shader_core(&b, is_integer, samples, input_img, + color, img_coord); nir_ssa_def *outval = nir_load_var(&b, color); + if (is_srgb) + outval = radv_meta_build_resolve_srgb_conversion(&b, outval); + nir_ssa_def *coord = nir_iadd(&b, global_id, &dst_offset->dest.ssa); nir_intrinsic_instr *store = nir_intrinsic_instr_create(b.shader, nir_intrinsic_image_store); store->src[0] = nir_src_for_ssa(coord); diff --git a/src/amd/vulkan/radv_meta_resolve_fs.c b/src/amd/vulkan/radv_meta_resolve_fs.c index a90678a2a3e..2f745f0ea09 100644 --- a/src/amd/vulkan/radv_meta_resolve_fs.c +++ b/src/amd/vulkan/radv_meta_resolve_fs.c @@ -51,7 +51,7 @@ build_nir_vertex_shader(void) } static nir_shader * -build_resolve_fragment_shader(struct radv_device *dev, bool is_integer, bool is_srgb, int samples) +build_resolve_fragment_shader(struct radv_device *dev, bool is_integer, int samples) { nir_builder b; char name[64]; @@ -62,7 +62,7 @@ build_resolve_fragment_shader(struct radv_device *dev, bool is_integer, bool is_ false, GLSL_TYPE_FLOAT); - snprintf(name, 64, "meta_resolve_fs-%d-%s", samples, is_integer ? "int" : (is_srgb ? "srgb" : "float")); + snprintf(name, 64, "meta_resolve_fs-%d-%s", samples, is_integer ? "int" : "float"); nir_builder_init_simple_shader(&b, NULL, MESA_SHADER_FRAGMENT, NULL); b.shader->info.name = ralloc_strdup(b.shader, name); @@ -92,8 +92,8 @@ build_resolve_fragment_shader(struct radv_device *dev, bool is_integer, bool is_ nir_ssa_def *img_coord = nir_channels(&b, nir_iadd(&b, pos_int, &src_offset->dest.ssa), 0x3); nir_variable *color = nir_local_variable_create(b.impl, glsl_vec4_type(), "color"); - radv_meta_build_resolve_shader_core(&b, is_integer, is_srgb,samples, - input_img, color, img_coord); + radv_meta_build_resolve_shader_core(&b, is_integer, samples, input_img, + color, img_coord); nir_ssa_def *outval = nir_load_var(&b, color); nir_store_var(&b, color_out, outval, 0xf); @@ -177,31 +177,25 @@ create_resolve_pipeline(struct radv_device *device, VkFormat format) { VkResult result; - bool is_integer = false, is_srgb = false; + bool is_integer = false; uint32_t samples = 1 << samples_log2; unsigned fs_key = radv_format_meta_fs_key(format); const VkPipelineVertexInputStateCreateInfo *vi_create_info; vi_create_info = &normal_vi_create_info; if (vk_format_is_int(format)) is_integer = true; - else if (vk_format_is_srgb(format)) - is_srgb = true; struct radv_shader_module fs = { .nir = NULL }; - fs.nir = build_resolve_fragment_shader(device, is_integer, is_srgb, samples); + fs.nir = build_resolve_fragment_shader(device, is_integer, samples); struct radv_shader_module vs = { .nir = build_nir_vertex_shader(), }; - VkRenderPass *rp = is_srgb ? - &device->meta_state.resolve_fragment.rc[samples_log2].srgb_render_pass : - &device->meta_state.resolve_fragment.rc[samples_log2].render_pass[fs_key]; + VkRenderPass *rp = &device->meta_state.resolve_fragment.rc[samples_log2].render_pass[fs_key]; assert(!*rp); - VkPipeline *pipeline = is_srgb ? - &device->meta_state.resolve_fragment.rc[samples_log2].srgb_pipeline : - &device->meta_state.resolve_fragment.rc[samples_log2].pipeline[fs_key]; + VkPipeline *pipeline = &device->meta_state.resolve_fragment.rc[samples_log2].pipeline[fs_key]; assert(!*pipeline); VkPipelineShaderStageCreateInfo pipeline_shader_stages[] = { @@ -350,8 +344,6 @@ radv_device_init_meta_resolve_fragment_state(struct radv_device *device) for (unsigned j = 0; j < ARRAY_SIZE(pipeline_formats); ++j) { res = create_resolve_pipeline(device, i, pipeline_formats[j]); } - - res = create_resolve_pipeline(device, i, VK_FORMAT_R8G8B8A8_SRGB); } return res; @@ -370,12 +362,6 @@ radv_device_finish_meta_resolve_fragment_state(struct radv_device *device) state->resolve_fragment.rc[i].pipeline[j], &state->alloc); } - radv_DestroyRenderPass(radv_device_to_handle(device), - state->resolve_fragment.rc[i].srgb_render_pass, - &state->alloc); - radv_DestroyPipeline(radv_device_to_handle(device), - state->resolve_fragment.rc[i].srgb_pipeline, - &state->alloc); } radv_DestroyDescriptorSetLayout(radv_device_to_handle(device), @@ -432,9 +418,7 @@ emit_resolve(struct radv_cmd_buffer *cmd_buffer, push_constants); unsigned fs_key = radv_format_meta_fs_key(dest_iview->vk_format); - VkPipeline pipeline_h = vk_format_is_srgb(dest_iview->vk_format) ? - device->meta_state.resolve_fragment.rc[samples_log2].srgb_pipeline : - device->meta_state.resolve_fragment.rc[samples_log2].pipeline[fs_key]; + VkPipeline pipeline_h = device->meta_state.resolve_fragment.rc[samples_log2].pipeline[fs_key]; radv_CmdBindPipeline(cmd_buffer_h, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline_h); @@ -485,9 +469,7 @@ void radv_meta_resolve_fragment_image(struct radv_cmd_buffer *cmd_buffer, radv_fast_clear_flush_image_inplace(cmd_buffer, src_image, &range); } - rp = vk_format_is_srgb(dest_image->vk_format) ? - device->meta_state.resolve_fragment.rc[samples_log2].srgb_render_pass : - device->meta_state.resolve_fragment.rc[samples_log2].render_pass[fs_key]; + rp = device->meta_state.resolve_fragment.rc[samples_log2].render_pass[fs_key]; radv_meta_save_graphics_reset_vport_scissor_novertex(&saved_state, cmd_buffer); for (uint32_t r = 0; r < region_count; ++r) { diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 6230efce81f..1f0e0252bf1 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -434,8 +434,6 @@ struct radv_meta_state { VkPipelineLayout p_layout; struct { - VkRenderPass srgb_render_pass; - VkPipeline srgb_pipeline; VkRenderPass render_pass[NUM_META_FS_KEYS]; VkPipeline pipeline[NUM_META_FS_KEYS]; } rc[MAX_SAMPLES_LOG2]; -- 2.30.2