OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv/meta: rework creating GFX color resolve pipelines

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30244>
This commit is contained in:
Samuel Pitoiset
2024-07-18 13:27:08 +02:00
committed by Marge Bot
parent 21dd086c07
commit edbf6fce55
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/amd/vulkan/meta/radv_meta_resolve_fs.c
View File

@@ -83,14 +83,8 @@ static const VkPipelineVertexInputStateCreateInfo normal_vi_create_info = {
static VkResult static VkResult
create_resolve_pipeline(struct radv_device *device, int samples_log2, VkFormat format) create_resolve_pipeline(struct radv_device *device, int samples_log2, VkFormat format)
{ {
mtx_lock(&device->meta_state.mtx);
unsigned fs_key = radv_format_meta_fs_key(device, format); unsigned fs_key = radv_format_meta_fs_key(device, format);
VkPipeline *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];
if (*pipeline) {
mtx_unlock(&device->meta_state.mtx);
return VK_SUCCESS;
}
VkResult result; VkResult result;
bool is_integer = false; bool is_integer = false;
@@ -189,8 +183,6 @@ create_resolve_pipeline(struct radv_device *device, int samples_log2, VkFormat f
&radv_pipeline_info, &device->meta_state.alloc, pipeline); &radv_pipeline_info, &device->meta_state.alloc, pipeline);
ralloc_free(vs); ralloc_free(vs);
ralloc_free(fs); ralloc_free(fs);
mtx_unlock(&device->meta_state.mtx);
return result; return result;
} }
@@ -579,28 +571,29 @@ radv_device_finish_meta_resolve_fragment_state(struct radv_device *device)
radv_DestroyPipelineLayout(radv_device_to_handle(device), state->resolve_fragment.p_layout, &state->alloc); radv_DestroyPipelineLayout(radv_device_to_handle(device), state->resolve_fragment.p_layout, &state->alloc);
} }
static VkPipeline * static VkResult
radv_get_resolve_pipeline(struct radv_cmd_buffer *cmd_buffer, struct radv_image_view *src_iview, get_color_resolve_pipeline(struct radv_device *device, struct radv_image_view *src_iview,
struct radv_image_view *dst_iview) struct radv_image_view *dst_iview, VkPipeline *pipeline_out)
{ {
struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); struct radv_meta_state *state = &device->meta_state;
unsigned fs_key = radv_format_meta_fs_key(device, dst_iview->vk.format); unsigned fs_key = radv_format_meta_fs_key(device, dst_iview->vk.format);
const uint32_t samples = src_iview->image->vk.samples; const uint32_t samples = src_iview->image->vk.samples;
const uint32_t samples_log2 = ffs(samples) - 1; const uint32_t samples_log2 = ffs(samples) - 1;
VkPipeline *pipeline; VkResult result = VK_SUCCESS;
pipeline = &device->meta_state.resolve_fragment.rc[samples_log2].pipeline[fs_key]; mtx_lock(&state->mtx);
if (!*pipeline) {
VkResult ret;
ret = create_resolve_pipeline(device, samples_log2, radv_fs_key_format_exemplars[fs_key]); if (!state->resolve_fragment.rc[samples_log2].pipeline[fs_key]) {
if (ret != VK_SUCCESS) { result = create_resolve_pipeline(device, samples_log2, radv_fs_key_format_exemplars[fs_key]);
vk_command_buffer_set_error(&cmd_buffer->vk, ret); if (result != VK_SUCCESS)
return NULL; goto fail;
}
} }
return pipeline; *pipeline_out = state->resolve_fragment.rc[samples_log2].pipeline[fs_key];
fail:
mtx_unlock(&state->mtx);
return result;
} }
static void static void
@@ -609,7 +602,8 @@ emit_resolve(struct radv_cmd_buffer *cmd_buffer, struct radv_image_view *src_ivi
{ {
struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); struct radv_device *device = radv_cmd_buffer_device(cmd_buffer);
VkCommandBuffer cmd_buffer_h = radv_cmd_buffer_to_handle(cmd_buffer); VkCommandBuffer cmd_buffer_h = radv_cmd_buffer_to_handle(cmd_buffer);
VkPipeline *pipeline; VkPipeline pipeline;
VkResult result;
radv_meta_push_descriptor_set(cmd_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, radv_meta_push_descriptor_set(cmd_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS,
device->meta_state.resolve_fragment.p_layout, 0, 1, device->meta_state.resolve_fragment.p_layout, 0, 1,
@@ -641,9 +635,13 @@ emit_resolve(struct radv_cmd_buffer *cmd_buffer, struct radv_image_view *src_ivi
vk_common_CmdPushConstants(radv_cmd_buffer_to_handle(cmd_buffer), device->meta_state.resolve_fragment.p_layout, vk_common_CmdPushConstants(radv_cmd_buffer_to_handle(cmd_buffer), device->meta_state.resolve_fragment.p_layout,
VK_SHADER_STAGE_FRAGMENT_BIT, 0, 8, push_constants); VK_SHADER_STAGE_FRAGMENT_BIT, 0, 8, push_constants);
pipeline = radv_get_resolve_pipeline(cmd_buffer, src_iview, dst_iview); result = get_color_resolve_pipeline(device, src_iview, dst_iview, &pipeline);
if (result != VK_SUCCESS) {
vk_command_buffer_set_error(&cmd_buffer->vk, result);
return;
}
radv_CmdBindPipeline(cmd_buffer_h, VK_PIPELINE_BIND_POINT_GRAPHICS, *pipeline); radv_CmdBindPipeline(cmd_buffer_h, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
radv_CmdDraw(cmd_buffer_h, 3, 1, 0, 0); radv_CmdDraw(cmd_buffer_h, 3, 1, 0, 0);
cmd_buffer->state.flush_bits |= radv_src_access_flush(cmd_buffer, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT, cmd_buffer->state.flush_bits |= radv_src_access_flush(cmd_buffer, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT,