From 4183002c629aada7a809e1bd85f325e8440c3250 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 14 Dec 2022 08:49:52 +0100 Subject: [PATCH] radv: use vk_dynamic_graphics_state for the fragment shading rate state Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 42 +++++++++++++++++--------------- src/amd/vulkan/radv_pipeline.c | 4 +-- src/amd/vulkan/radv_private.h | 7 ++---- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 682d675ca28..b16e3c03e3f 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -66,6 +66,15 @@ static void radv_handle_image_transition(struct radv_cmd_buffer *cmd_buffer, static void radv_set_rt_stack_size(struct radv_cmd_buffer *cmd_buffer, uint32_t size); const struct radv_dynamic_state default_dynamic_state = { + .vk = + { + .fsr = + { + .fragment_size = {1u, 1u}, + .combiner_ops = {VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR, + VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR}, + }, + }, .viewport = { .count = 0, @@ -110,12 +119,6 @@ const struct radv_dynamic_state default_dynamic_state = { .cull_mode = 0u, .front_face = 0u, .primitive_topology = 0u, - .fragment_shading_rate = - { - .size = {1u, 1u}, - .combiner_ops = {VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR, - VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR}, - }, .depth_bias_enable = 0u, .primitive_restart_enable = 0u, .rasterizer_discard_enable = 0u, @@ -253,10 +256,10 @@ radv_bind_dynamic_state(struct radv_cmd_buffer *cmd_buffer, const struct radv_dy RADV_CMP_COPY(stencil_op.back.depth_fail_op, RADV_DYNAMIC_STENCIL_OP); RADV_CMP_COPY(stencil_op.back.compare_op, RADV_DYNAMIC_STENCIL_OP); - RADV_CMP_COPY(fragment_shading_rate.size.width, RADV_DYNAMIC_FRAGMENT_SHADING_RATE); - RADV_CMP_COPY(fragment_shading_rate.size.height, RADV_DYNAMIC_FRAGMENT_SHADING_RATE); - RADV_CMP_COPY(fragment_shading_rate.combiner_ops[0], RADV_DYNAMIC_FRAGMENT_SHADING_RATE); - RADV_CMP_COPY(fragment_shading_rate.combiner_ops[1], RADV_DYNAMIC_FRAGMENT_SHADING_RATE); + RADV_CMP_COPY(vk.fsr.fragment_size.width, RADV_DYNAMIC_FRAGMENT_SHADING_RATE); + RADV_CMP_COPY(vk.fsr.fragment_size.height, RADV_DYNAMIC_FRAGMENT_SHADING_RATE); + RADV_CMP_COPY(vk.fsr.combiner_ops[0], RADV_DYNAMIC_FRAGMENT_SHADING_RATE); + RADV_CMP_COPY(vk.fsr.combiner_ops[1], RADV_DYNAMIC_FRAGMENT_SHADING_RATE); RADV_CMP_COPY(depth_bias_enable, RADV_DYNAMIC_DEPTH_BIAS_ENABLE); @@ -2270,11 +2273,11 @@ radv_emit_fragment_shading_rate(struct radv_cmd_buffer *cmd_buffer) { const struct radv_graphics_pipeline *pipeline = cmd_buffer->state.graphics_pipeline; const struct radv_dynamic_state *d = &cmd_buffer->state.dynamic; - uint32_t rate_x = MIN2(2, d->fragment_shading_rate.size.width) - 1; - uint32_t rate_y = MIN2(2, d->fragment_shading_rate.size.height) - 1; + uint32_t rate_x = MIN2(2, d->vk.fsr.fragment_size.width) - 1; + uint32_t rate_y = MIN2(2, d->vk.fsr.fragment_size.height) - 1; uint32_t pa_cl_vrs_cntl = pipeline->vrs.pa_cl_vrs_cntl; - uint32_t pipeline_comb_mode = d->fragment_shading_rate.combiner_ops[0]; - uint32_t htile_comb_mode = d->fragment_shading_rate.combiner_ops[1]; + uint32_t pipeline_comb_mode = d->vk.fsr.combiner_ops[0]; + uint32_t htile_comb_mode = d->vk.fsr.combiner_ops[1]; assert(cmd_buffer->device->physical_device->rad_info.gfx_level >= GFX10_3); @@ -6481,9 +6484,9 @@ radv_CmdSetFragmentShadingRateKHR(VkCommandBuffer commandBuffer, const VkExtent2 RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); struct radv_cmd_state *state = &cmd_buffer->state; - state->dynamic.fragment_shading_rate.size = *pFragmentSize; + state->dynamic.vk.fsr.fragment_size = *pFragmentSize; for (unsigned i = 0; i < 2; i++) - state->dynamic.fragment_shading_rate.combiner_ops[i] = combinerOps[i]; + state->dynamic.vk.fsr.combiner_ops[i] = combinerOps[i]; state->dirty |= RADV_CMD_DIRTY_DYNAMIC_FRAGMENT_SHADING_RATE; } @@ -8428,10 +8431,9 @@ radv_emit_all_graphics_states(struct radv_cmd_buffer *cmd_buffer, const struct r cmd_buffer->state.dirty & cmd_buffer->state.emitted_graphics_pipeline->needed_dynamic_state; if ((dynamic_states & RADV_CMD_DIRTY_DYNAMIC_FRAGMENT_SHADING_RATE) && - d->fragment_shading_rate.size.width == 1 && - d->fragment_shading_rate.size.height == 1 && - d->fragment_shading_rate.combiner_ops[0] == VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR && - d->fragment_shading_rate.combiner_ops[1] == VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR) { + d->vk.fsr.fragment_size.width == 1 && d->vk.fsr.fragment_size.height == 1 && + d->vk.fsr.combiner_ops[0] == VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR && + d->vk.fsr.combiner_ops[1] == VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR) { /* When per-vertex VRS is forced and the dynamic fragment shading rate is a no-op, ignore * it. This is needed for vkd3d-proton because it always declares per-draw VRS as dynamic. */ diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index b5cc6c87076..94c10e29b0e 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -1662,9 +1662,7 @@ radv_pipeline_init_dynamic_state(struct radv_graphics_pipeline *pipeline, } if (states & RADV_DYNAMIC_FRAGMENT_SHADING_RATE) { - dynamic->fragment_shading_rate.size = state->fsr->fragment_size; - for (int i = 0; i < 2; i++) - dynamic->fragment_shading_rate.combiner_ops[i] = state->fsr->combiner_ops[i]; + dynamic->vk.fsr = *state->fsr; } if (states & RADV_DYNAMIC_DEPTH_BIAS_ENABLE) { diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 66fa0c394cd..7c9ad0584a7 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -1321,6 +1321,8 @@ struct radv_sample_locations_state { }; struct radv_dynamic_state { + struct vk_dynamic_graphics_state vk; + /** * Bitmask of (1ull << VK_DYNAMIC_STATE_*). * Defines the set of saved dynamic state. @@ -1403,11 +1405,6 @@ struct radv_dynamic_state { bool depth_bounds_test_enable; bool stencil_test_enable; - struct { - VkExtent2D size; - VkFragmentShadingRateCombinerOpKHR combiner_ops[2]; - } fragment_shading_rate; - bool depth_bias_enable; bool primitive_restart_enable; bool rasterizer_discard_enable;