summaryrefslogtreecommitdiff
path: root/src/vk/sprite_3d.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/vk/sprite_3d.cpp')
-rw-r--r--src/vk/sprite_3d.cpp17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/vk/sprite_3d.cpp b/src/vk/sprite_3d.cpp
index 9794285..66199f1 100644
--- a/src/vk/sprite_3d.cpp
+++ b/src/vk/sprite_3d.cpp
@@ -53,13 +53,10 @@ load_descriptor_set_pool(void *obj)
{
auto self = static_cast<VK::Sprite3D*>(obj);
- std::array<VkDescriptorPoolSize, 2> descriptor_pool_sizes{};
+ std::array<VkDescriptorPoolSize, 1> descriptor_pool_sizes{};
descriptor_pool_sizes[0].type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
descriptor_pool_sizes[0].descriptorCount =
self->uniform_buffers.size();
- descriptor_pool_sizes[1].type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
- descriptor_pool_sizes[1].descriptorCount =
- cg_core.vk_swapchain->images_count;
VkDescriptorPoolCreateInfo pool_info{};
pool_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
@@ -122,7 +119,7 @@ load_buffers_to_descriptor_sets(void *obj)
image_info.imageView = self->sprite->texture->view;
image_info.sampler = self->sprite->texture->sampler;
- std::array<VkWriteDescriptorSet, 2> write_descriptors{};
+ std::array<VkWriteDescriptorSet, 1> write_descriptors{};
write_descriptors[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
write_descriptors[0].dstSet = self->descriptor_sets[i];
write_descriptors[0].dstBinding = 0;
@@ -132,16 +129,6 @@ load_buffers_to_descriptor_sets(void *obj)
write_descriptors[0].pBufferInfo = &buffer_info;
write_descriptors[0].pImageInfo = nullptr;
write_descriptors[0].pTexelBufferView = nullptr;
- write_descriptors[1].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
- write_descriptors[1].dstSet = self->descriptor_sets[i];
- write_descriptors[1].dstBinding = 1;
- write_descriptors[1].dstArrayElement = 0;
- write_descriptors[1].descriptorCount = 1;
- write_descriptors[1].descriptorType =
- VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
- write_descriptors[1].pBufferInfo = nullptr;
- write_descriptors[1].pImageInfo = &image_info;
- write_descriptors[1].pTexelBufferView = nullptr;
vkUpdateDescriptorSets(
cg_core.vk_device_with_swapchain->device, write_descriptors.size(),