Increased the sizes of descriptor pools to actually fit the descripto…

…r sets.
TitomakaniJr · Dec 4, 2020 · 4177261 · 4177261
1 parent 5a64117
commit 4177261
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/refresh/vkpt/path_tracer.c b/src/refresh/vkpt/path_tracer.c
@@ -239,7 +239,7 @@ vkpt_pt_init()
 	ATTACH_LABEL_VARIABLE(rt_pipeline_layout, PIPELINE_LAYOUT);
 
 	VkDescriptorPoolSize pool_sizes[] = {
-		{ VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, MAX_FRAMES_IN_FLIGHT },
+		{ VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, MAX_FRAMES_IN_FLIGHT * LENGTH(bindings) },
 		{ qvk.use_khr_ray_tracing ? VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR : VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV, MAX_FRAMES_IN_FLIGHT }
 	};
 

diff --git a/src/refresh/vkpt/textures.c b/src/refresh/vkpt/textures.c
@@ -987,7 +987,7 @@ vkpt_textures_initialize()
 	ATTACH_LABEL_VARIABLE(qvk.desc_set_layout_textures, DESCRIPTOR_SET_LAYOUT);
 	VkDescriptorPoolSize pool_size = {
 		.type            = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
-		.descriptorCount = MAX_RIMAGES + 2 * NUM_VKPT_IMAGES + 128,
+		.descriptorCount = 2 * (MAX_RIMAGES + 2 * NUM_VKPT_IMAGES) + 128,
 	};
 
 	VkDescriptorPoolCreateInfo pool_info = {

diff --git a/src/refresh/vkpt/vertex_buffer.c b/src/refresh/vkpt/vertex_buffer.c
@@ -707,7 +707,7 @@ vkpt_vertex_buffer_create()
 
 	VkDescriptorPoolSize pool_size = {
 		.type            = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
-		.descriptorCount = LENGTH(vbo_layout_bindings) + MAX_MODELS,
+		.descriptorCount = LENGTH(vbo_layout_bindings) + MAX_MODELS + 128,
 	};
 
 	VkDescriptorPoolCreateInfo pool_info = {