hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 12:55:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

render/vulkan: move VkDescriptorSetAllocateInfo down

Browse source 
Move it down, right before it's used.
This commit is contained in:
Simon Ser 2022-11-30 18:02:38 +01:00 committed by Alexander Orzechowski
parent 4b3bbb0c4f
commit 47a038c90e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
render/vulkan/renderer.c
View file

@ -88,11 +88,6 @@ static void mat3_to_mat4(const float mat3[9], float mat4[4][4]) {
struct wlr_vk_descriptor_pool *vulkan_alloc_texture_ds( struct wlr_vk_descriptor_pool *vulkan_alloc_texture_ds(
struct wlr_vk_renderer *renderer, VkDescriptorSet *ds) { struct wlr_vk_renderer *renderer, VkDescriptorSet *ds) {
VkResult res; VkResult res;
VkDescriptorSetAllocateInfo ds_info = {
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
.descriptorSetCount = 1,
.pSetLayouts = &renderer->ds_layout,
};
bool found = false; bool found = false;
struct wlr_vk_descriptor_pool *pool; struct wlr_vk_descriptor_pool *pool;
@ -140,7 +135,12 @@ struct wlr_vk_descriptor_pool *vulkan_alloc_texture_ds(
wl_list_insert(&renderer->descriptor_pools, &pool->link); wl_list_insert(&renderer->descriptor_pools, &pool->link);
} }
ds_info.descriptorPool = pool->pool; VkDescriptorSetAllocateInfo ds_info = {
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
.descriptorSetCount = 1,
.pSetLayouts = &renderer->ds_layout,
.descriptorPool = pool->pool,
};
res = vkAllocateDescriptorSets(renderer->dev->dev, &ds_info, ds); res = vkAllocateDescriptorSets(renderer->dev->dev, &ds_info, ds);
if (res != VK_SUCCESS) { if (res != VK_SUCCESS) {
wlr_vk_error("vkAllocateDescriptorSets", res); wlr_vk_error("vkAllocateDescriptorSets", res);