Provisional multithreading framework

src/Engine/Graphics/Vulkan/VulkanCommandBuffer.cpp

@@ -65,7 +65,7 @@ void CmdBuffer::beginRenderPass(PRenderPass newRenderPass, PFramebuffer newFrame
 
     VkRenderPassBeginInfo beginInfo =
         init::RenderPassBeginInfo();
-    beginInfo.clearValueCount = renderPass->getClearValueCount();
+    beginInfo.clearValueCount = (uint32)renderPass->getClearValueCount();
     beginInfo.pClearValues = renderPass->getClearValues();
     beginInfo.renderArea = renderPass->getRenderArea();
     beginInfo.renderPass = renderPass->getHandle();
@@ -95,7 +95,7 @@ void CmdBuffer::executeCommands(Array<Gfx::PRenderCommand> commands)
         }
         cmdBuffers[i] = command->getHandle();
     }
-    vkCmdExecuteCommands(handle, cmdBuffers.size(), cmdBuffers.data());
+    vkCmdExecuteCommands(handle, (uint32)cmdBuffers.size(), cmdBuffers.data());
 }
 
 void CmdBuffer::addWaitSemaphore(VkPipelineStageFlags flags, PSemaphore semaphore)
@@ -212,7 +212,7 @@ void SecondaryCmdBuffer::bindDescriptor(const Array<Gfx::PDescriptorSet>& descri
         boundDescriptors.add(descriptorSet);
         sets[descriptorSet->getSetIndex()] = descriptorSet->getHandle();
     }
-    vkCmdBindDescriptorSets(handle, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline->getLayout(), 0, descriptorSets.size(), sets, 0, nullptr);
+    vkCmdBindDescriptorSets(handle, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline->getLayout(), 0, (uint32)descriptorSets.size(), sets, 0, nullptr);
     delete[] sets;
 }
 void SecondaryCmdBuffer::bindVertexBuffer(const Array<VertexInputStream>& streams)
@@ -225,7 +225,7 @@ void SecondaryCmdBuffer::bindVertexBuffer(const Array<VertexInputStream>& stream
         buffers[i] = buf->getHandle();
         offsets[i] = streams[i].offset;
     };
-    vkCmdBindVertexBuffers(handle, 0, streams.size(), buffers.data(), offsets.data());
+    vkCmdBindVertexBuffers(handle, 0, (uint32)streams.size(), buffers.data(), offsets.data());
 }
 void SecondaryCmdBuffer::bindIndexBuffer(Gfx::PIndexBuffer indexBuffer)
 {

src/Engine/Graphics/Vulkan/VulkanDescriptorSets.cpp

@@ -39,7 +39,7 @@ void DescriptorLayout::create()
 		binding.pImmutableSamplers = nullptr;
 	}
 	VkDescriptorSetLayoutCreateInfo createInfo =
-		init::DescriptorSetLayoutCreateInfo(bindings.data(), bindings.size());
+		init::DescriptorSetLayoutCreateInfo(bindings.data(), (uint32)bindings.size());
 	VK_CHECK(vkCreateDescriptorSetLayout(graphics->getDevice(), &createInfo, nullptr, &layoutHandle));
 
 	allocator = new DescriptorAllocator(graphics, *this);
@@ -75,7 +75,7 @@ void PipelineLayout::create()
 	}
 
 	VkPipelineLayoutCreateInfo createInfo =
-		init::PipelineLayoutCreateInfo(vulkanDescriptorLayouts.data(), vulkanDescriptorLayouts.size());
+		init::PipelineLayoutCreateInfo(vulkanDescriptorLayouts.data(), (uint32)vulkanDescriptorLayouts.size());
 	Array<VkPushConstantRange> vkPushConstants(pushConstants.size());
 	for (size_t i = 0; i < pushConstants.size(); i++)
 	{
@@ -83,7 +83,7 @@ void PipelineLayout::create()
 		vkPushConstants[i].size = pushConstants[i].size;
 		vkPushConstants[i].stageFlags = cast((VkShaderStageFlagBits)pushConstants[i].stageFlags);
 	}
-	createInfo.pushConstantRangeCount = vkPushConstants.size();
+	createInfo.pushConstantRangeCount = (uint32)vkPushConstants.size();
 	createInfo.pPushConstantRanges = vkPushConstants.data();
 
 	boost::crc_32_type result;
@@ -198,7 +198,7 @@ void DescriptorSet::updateTexture(uint32_t binding, Gfx::PTexture texture, Gfx::
 bool DescriptorSet::operator<(Gfx::PDescriptorSet other)
 {
 	PDescriptorSet otherSet = other.cast<DescriptorSet>();
-	return setHandle < otherSet->setHandle;
+	return this < otherSet.getHandle();
 }
 
 void DescriptorSet::writeChanges()
@@ -210,7 +210,7 @@ void DescriptorSet::writeChanges()
 			currentlyBound->getManager()->waitForCommands(currentlyBound);
 			currentlyBound = nullptr;
 		}
-		vkUpdateDescriptorSets(graphics->getDevice(), writeDescriptors.size(), writeDescriptors.data(), 0, nullptr);
+		vkUpdateDescriptorSets(graphics->getDevice(), (uint32)writeDescriptors.size(), writeDescriptors.data(), 0, nullptr);
 		writeDescriptors.clear();
 		imageInfos.clear();
 		bufferInfos.clear();
@@ -241,7 +241,7 @@ DescriptorAllocator::DescriptorAllocator(PGraphics graphics, DescriptorLayout &l
 			poolSizes.add(size);
 		}
 	}
-	VkDescriptorPoolCreateInfo createInfo = init::DescriptorPoolCreateInfo(poolSizes.size(), poolSizes.data(), maxSets);
+	VkDescriptorPoolCreateInfo createInfo = init::DescriptorPoolCreateInfo((uint32)poolSizes.size(), poolSizes.data(), maxSets);
 	VK_CHECK(vkCreateDescriptorPool(graphics->getDevice(), &createInfo, nullptr, &poolHandle));
 }
 

src/Engine/Graphics/Vulkan/VulkanFramebuffer.cpp

@@ -34,7 +34,7 @@ Framebuffer::Framebuffer(PGraphics graphics, PRenderPass renderPass, Gfx::PRende
     VkFramebufferCreateInfo createInfo =
         init::FramebufferCreateInfo(
             renderPass->getHandle(),
-            attachments.size(),
+            (uint32)attachments.size(),
             attachments.data(),
             renderPass->getRenderArea().extent.width,
             renderPass->getRenderArea().extent.height,

src/Engine/Graphics/Vulkan/VulkanPipelineCache.cpp

@@ -215,9 +215,9 @@ PGraphicsPipeline PipelineCache::createPipeline(const GraphicsPipelineCreateInfo
     std::memcpy(hashStruct.attribs, attributes.data(), attributes.size() * sizeof(VkVertexInputAttributeDescription));
 
     vertexInput.pVertexBindingDescriptions = bindings.data();
-    vertexInput.vertexBindingDescriptionCount = bindings.size();
+    vertexInput.vertexBindingDescriptionCount = (uint32)bindings.size();
     vertexInput.pVertexAttributeDescriptions = attributes.data();
-    vertexInput.vertexAttributeDescriptionCount = attributes.size();
+    vertexInput.vertexAttributeDescriptionCount = (uint32)attributes.size();
 
     VkPipelineInputAssemblyStateCreateInfo assemblyInfo =
         init::PipelineInputAssemblyStateCreateInfo(
@@ -291,7 +291,7 @@ PGraphicsPipeline PipelineCache::createPipeline(const GraphicsPipelineCreateInfo
     }
     VkPipelineColorBlendStateCreateInfo blendState = 
         init::PipelineColorBlendStateCreateInfo(
-            blendAttachments.size(),
+            (uint32)blendAttachments.size(),
             blendAttachments.data()
         );
     blendState.logicOpEnable = gfxInfo.colorBlend.logicOpEnable;

src/Engine/Graphics/Vulkan/VulkanRenderPass.cpp

@@ -91,10 +91,10 @@ RenderPass::RenderPass(PGraphics graphics, Gfx::PRenderTargetLayout layout)
     VkSubpassDescription subPassDesc =
         init::SubpassDescription(
             VK_PIPELINE_BIND_POINT_GRAPHICS,
-            colorRefs.size(),
+            (uint32)colorRefs.size(),
             colorRefs.data(),
             &depthRef,
-            inputRefs.size(),
+            (uint32)inputRefs.size(),
             inputRefs.data());
     VkSubpassDependency dependency = {};
     dependency.srcSubpass = VK_SUBPASS_EXTERNAL;
@@ -108,7 +108,7 @@ RenderPass::RenderPass(PGraphics graphics, Gfx::PRenderTargetLayout layout)
 
     VkRenderPassCreateInfo info =
         init::RenderPassCreateInfo(
-            attachments.size(),
+            (uint32)attachments.size(),
             attachments.data(),
             1,
             &subPassDesc,

src/Engine/Graphics/Vulkan/VulkanRenderPass.h

@@ -15,7 +15,7 @@ public:
     {
         return renderPass;
     }
-    inline uint32 getClearValueCount() const
+    inline size_t getClearValueCount() const
     {
         return clearValues.size();
     }

src/Engine/Graphics/Vulkan/VulkanShader.cpp

@@ -113,7 +113,7 @@ void Shader::create(const ShaderCreateInfo& createInfo)
     spAddSearchPath(request, "shaders/lib/");
     spAddSearchPath(request, "shaders/generated/");
 
-    spSetGlobalGenericArgs(request, createInfo.typeParameter.size(), createInfo.typeParameter.data());
+    spSetGlobalGenericArgs(request, (int)createInfo.typeParameter.size(), createInfo.typeParameter.data());
     
     int entryPointIndex = spAddEntryPoint(request, translationUnitIndex, entryPointName.c_str(), getStageFromShaderType(type));
     if(spCompile(request))