fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 00:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan/meta: Use vk_meta_get_pipeline_layout in blit/resolve

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand 2023-07-26 16:22:20 -05:00 • committed by Marge Bot
parent 574d6362ca
commit afd6219055
1 changed files with 8 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/vulkan/runtime/vk_meta_blit_resolve.c
View file

@ -332,18 +332,11 @@ build_blit_shader(const struct vk_meta_blit_key *key)
}
static VkResult
get_blit_descriptor_set_layout(struct vk_device *device,
struct vk_meta_device *meta,
VkDescriptorSetLayout *layout_out)
get_blit_pipeline_layout(struct vk_device *device,
struct vk_meta_device *meta,
VkPipelineLayout *layout_out)
{
const char key[] = "vk-meta-blit-descriptor-set-layout";
VkDescriptorSetLayout from_cache =
vk_meta_lookup_descriptor_set_layout(meta, key, sizeof(key));
if (from_cache != VK_NULL_HANDLE) {
*layout_out = from_cache;
return VK_SUCCESS;
}
const char key[] = "vk-meta-blit-pipeline-layout";
const VkDescriptorSetLayoutBinding bindings[] = {{
.binding = BLIT_DESC_BINDING_SAMPLER,
@ -367,47 +360,20 @@ get_blit_descriptor_set_layout(struct vk_device *device,
.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
}};
const VkDescriptorSetLayoutCreateInfo info = {
const VkDescriptorSetLayoutCreateInfo desc_info = {
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
.bindingCount = ARRAY_SIZE(bindings),
.pBindings = bindings,
};
return vk_meta_create_descriptor_set_layout(device, meta, &info,
key, sizeof(key), layout_out);
}
static VkResult
get_blit_pipeline_layout(struct vk_device *device,
struct vk_meta_device *meta,
VkDescriptorSetLayout set_layout,
VkPipelineLayout *layout_out)
{
const char key[] = "vk-meta-blit-pipeline-layout";
VkPipelineLayout from_cache =
vk_meta_lookup_pipeline_layout(meta, key, sizeof(key));
if (from_cache != VK_NULL_HANDLE) {
*layout_out = from_cache;
return VK_SUCCESS;
}
const VkPushConstantRange push_range = {
.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
.offset = 0,
.size = sizeof(struct vk_meta_blit_push_data),
};
const VkPipelineLayoutCreateInfo info = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
.setLayoutCount = 1,
.pSetLayouts = &set_layout,
.pushConstantRangeCount = 1,
.pPushConstantRanges = &push_range,
};
return vk_meta_create_pipeline_layout(device, meta, &info,
key, sizeof(key), layout_out);
return vk_meta_get_pipeline_layout(device, meta, &desc_info, &push_range,
key, sizeof(key), layout_out);
}
static VkResult
@ -545,16 +511,8 @@ do_blit(struct vk_command_buffer *cmd,
const struct vk_device_dispatch_table *disp = &device->dispatch_table;
VkResult result;
VkDescriptorSetLayout set_layout;
result = get_blit_descriptor_set_layout(device, meta, &set_layout);
if (unlikely(result != VK_SUCCESS)) {
vk_command_buffer_set_error(cmd, result);
return;
}
VkPipelineLayout pipeline_layout;
result = get_blit_pipeline_layout(device, meta, set_layout,
&pipeline_layout);
result = get_blit_pipeline_layout(device, meta, &pipeline_layout);
if (unlikely(result != VK_SUCCESS)) {
vk_command_buffer_set_error(cmd, result);
return;