diff --git a/src/amd/vulkan/meta/radv_meta.c b/src/amd/vulkan/meta/radv_meta.c index e7b590def72..a3688c41090 100644 --- a/src/amd/vulkan/meta/radv_meta.c +++ b/src/amd/vulkan/meta/radv_meta.c @@ -496,10 +496,6 @@ radv_device_init_meta(struct radv_device *device) return result; if (pdev->use_fmask) { - result = radv_device_init_meta_fmask_expand_state(device, on_demand); - if (result != VK_SUCCESS) - return result; - result = radv_device_init_meta_fmask_copy_state(device, on_demand); if (result != VK_SUCCESS) return result; @@ -560,7 +556,6 @@ radv_device_finish_meta(struct radv_device *device) radv_device_finish_meta_fast_clear_flush_state(device); radv_device_finish_meta_resolve_compute_state(device); radv_device_finish_meta_resolve_fragment_state(device); - radv_device_finish_meta_fmask_expand_state(device); radv_device_finish_meta_dcc_retile_state(device); radv_device_finish_meta_fmask_copy_state(device); diff --git a/src/amd/vulkan/meta/radv_meta.h b/src/amd/vulkan/meta/radv_meta.h index 852f76e9d85..48fadf5fc4b 100644 --- a/src/amd/vulkan/meta/radv_meta.h +++ b/src/amd/vulkan/meta/radv_meta.h @@ -135,9 +135,6 @@ void radv_device_finish_meta_resolve_fragment_state(struct radv_device *device); VkResult radv_device_init_meta_fmask_copy_state(struct radv_device *device, bool on_demand); void radv_device_finish_meta_fmask_copy_state(struct radv_device *device); -VkResult radv_device_init_meta_fmask_expand_state(struct radv_device *device, bool on_demand); -void radv_device_finish_meta_fmask_expand_state(struct radv_device *device); - void radv_device_finish_meta_dcc_retile_state(struct radv_device *device); VkResult radv_device_init_null_accel_struct(struct radv_device *device); diff --git a/src/amd/vulkan/meta/radv_meta_fmask_expand.c b/src/amd/vulkan/meta/radv_meta_fmask_expand.c index 8da13485c3e..0da8170383c 100644 --- a/src/amd/vulkan/meta/radv_meta_fmask_expand.c +++ b/src/amd/vulkan/meta/radv_meta_fmask_expand.c @@ -50,67 +50,71 @@ build_fmask_expand_compute_shader(struct radv_device *device, int samples) } static VkResult -create_pipeline(struct radv_device *device, int samples, VkPipeline *pipeline) +get_pipeline(struct radv_device *device, uint32_t samples_log2, VkPipeline *pipeline_out, VkPipelineLayout *layout_out) { - struct radv_meta_state *state = &device->meta_state; + const uint32_t samples = 1 << samples_log2; + char key_data[64]; VkResult result; - if (!state->fmask_expand.ds_layout) { - const VkDescriptorSetLayoutBinding bindings[] = { - { - .binding = 0, - .descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, - .descriptorCount = 1, - .stageFlags = VK_SHADER_STAGE_COMPUTE_BIT, - }, - { - .binding = 1, - .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, - .descriptorCount = 1, - .stageFlags = VK_SHADER_STAGE_COMPUTE_BIT, - }, - }; + snprintf(key_data, sizeof(key_data), "radv-fmask-expand-%d", samples); - result = radv_meta_create_descriptor_set_layout(device, 2, bindings, &state->fmask_expand.ds_layout); - if (result != VK_SUCCESS) - return result; - } + const VkDescriptorSetLayoutBinding bindings[] = { + { + .binding = 0, + .descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, + .descriptorCount = 1, + .stageFlags = VK_SHADER_STAGE_COMPUTE_BIT, + }, + { + .binding = 1, + .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, + .descriptorCount = 1, + .stageFlags = VK_SHADER_STAGE_COMPUTE_BIT, + }, + }; - if (!state->fmask_expand.p_layout) { - result = radv_meta_create_pipeline_layout(device, &state->fmask_expand.ds_layout, 0, NULL, - &state->fmask_expand.p_layout); - if (result != VK_SUCCESS) - return result; + const VkDescriptorSetLayoutCreateInfo desc_info = { + .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO, + .flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT, + .bindingCount = 2, + .pBindings = bindings, + }; + + result = vk_meta_get_pipeline_layout(&device->vk, &device->meta_state.device, &desc_info, NULL, key_data, + strlen(key_data), layout_out); + if (result != VK_SUCCESS) + return result; + + VkPipeline pipeline_from_cache = vk_meta_lookup_pipeline(&device->meta_state.device, key_data, strlen(key_data)); + if (pipeline_from_cache != VK_NULL_HANDLE) { + *pipeline_out = pipeline_from_cache; + return VK_SUCCESS; } nir_shader *cs = build_fmask_expand_compute_shader(device, samples); - result = radv_meta_create_compute_pipeline(device, cs, state->fmask_expand.p_layout, pipeline); + const VkPipelineShaderStageCreateInfo stage_info = { + .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO, + .stage = VK_SHADER_STAGE_COMPUTE_BIT, + .module = vk_shader_module_handle_from_nir(cs), + .pName = "main", + .pSpecializationInfo = NULL, + }; + + const VkComputePipelineCreateInfo pipeline_info = { + .sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO, + .stage = stage_info, + .flags = 0, + .layout = *layout_out, + }; + + result = vk_meta_create_compute_pipeline(&device->vk, &device->meta_state.device, &pipeline_info, key_data, + strlen(key_data), pipeline_out); ralloc_free(cs); return result; } -static VkResult -get_pipeline(struct radv_device *device, uint32_t samples_log2, VkPipeline *pipeline_out) -{ - struct radv_meta_state *state = &device->meta_state; - VkResult result = VK_SUCCESS; - - mtx_lock(&state->mtx); - if (!state->fmask_expand.pipeline[samples_log2]) { - result = create_pipeline(device, 1 << samples_log2, &state->fmask_expand.pipeline[samples_log2]); - if (result != VK_SUCCESS) - goto fail; - } - - *pipeline_out = state->fmask_expand.pipeline[samples_log2]; - -fail: - mtx_unlock(&state->mtx); - return result; -} - void radv_expand_fmask_image_inplace(struct radv_cmd_buffer *cmd_buffer, struct radv_image *image, const VkImageSubresourceRange *subresourceRange) @@ -121,10 +125,11 @@ radv_expand_fmask_image_inplace(struct radv_cmd_buffer *cmd_buffer, struct radv_ const uint32_t samples_log2 = ffs(samples) - 1; unsigned layer_count = vk_image_subresource_layer_count(&image->vk, subresourceRange); struct radv_image_view iview; + VkPipelineLayout layout; VkPipeline pipeline; VkResult result; - result = get_pipeline(device, samples_log2, &pipeline); + result = get_pipeline(device, samples_log2, &pipeline, &layout); if (result != VK_SUCCESS) { vk_command_buffer_set_error(&cmd_buffer->vk, result); return; @@ -156,8 +161,7 @@ radv_expand_fmask_image_inplace(struct radv_cmd_buffer *cmd_buffer, struct radv_ cmd_buffer->state.flush_bits |= radv_dst_access_flush(cmd_buffer, VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT, VK_ACCESS_2_SHADER_READ_BIT, image, &range); - radv_meta_push_descriptor_set(cmd_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, device->meta_state.fmask_expand.p_layout, - 0, 2, + radv_meta_push_descriptor_set(cmd_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, layout, 0, 2, (VkWriteDescriptorSet[]){{.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, .dstBinding = 0, .dstArrayElement = 0, @@ -193,35 +197,3 @@ radv_expand_fmask_image_inplace(struct radv_cmd_buffer *cmd_buffer, struct radv_ /* Re-initialize FMASK in fully expanded mode. */ cmd_buffer->state.flush_bits |= radv_init_fmask(cmd_buffer, image, subresourceRange); } - -void -radv_device_finish_meta_fmask_expand_state(struct radv_device *device) -{ - struct radv_meta_state *state = &device->meta_state; - - for (uint32_t i = 0; i < MAX_SAMPLES_LOG2; ++i) { - radv_DestroyPipeline(radv_device_to_handle(device), state->fmask_expand.pipeline[i], &state->alloc); - } - radv_DestroyPipelineLayout(radv_device_to_handle(device), state->fmask_expand.p_layout, &state->alloc); - - device->vk.dispatch_table.DestroyDescriptorSetLayout(radv_device_to_handle(device), state->fmask_expand.ds_layout, - &state->alloc); -} - -VkResult -radv_device_init_meta_fmask_expand_state(struct radv_device *device, bool on_demand) -{ - struct radv_meta_state *state = &device->meta_state; - VkResult result; - - if (on_demand) - return VK_SUCCESS; - - for (uint32_t i = 0; i < MAX_SAMPLES_LOG2; i++) { - result = create_pipeline(device, 1 << i, &state->fmask_expand.pipeline[i]); - if (result != VK_SUCCESS) - return result; - } - - return VK_SUCCESS; -} diff --git a/src/amd/vulkan/radv_device.h b/src/amd/vulkan/radv_device.h index 593f04e1476..ac7621f18a0 100644 --- a/src/amd/vulkan/radv_device.h +++ b/src/amd/vulkan/radv_device.h @@ -279,12 +279,6 @@ struct radv_meta_state { VkPipeline ms_prim_gen_query_pipeline; } query; - struct { - VkDescriptorSetLayout ds_layout; - VkPipelineLayout p_layout; - VkPipeline pipeline[MAX_SAMPLES_LOG2]; - } fmask_expand; - struct { VkDescriptorSetLayout ds_layout; VkPipelineLayout p_layout;