diff --git a/openVulkanoCpp/Vulkan/Renderer.cpp b/openVulkanoCpp/Vulkan/Renderer.cpp index 9931420..a6f4a7b 100644 --- a/openVulkanoCpp/Vulkan/Renderer.cpp +++ b/openVulkanoCpp/Vulkan/Renderer.cpp @@ -114,7 +114,7 @@ namespace OpenVulkano::Vulkan resourceManager.Resize(); } - CommandHelper* Renderer::GetCommandData(uint32_t poolId) + CommandHelper* Renderer::GetCommandData(size_t poolId) { return &commands[poolId][currentImageId]; } @@ -173,7 +173,7 @@ namespace OpenVulkano::Vulkan Submit(); } - void Renderer::RecordSecondaryBuffer(Data::ReadOnlyAtomicArrayQueue* jobQueue, uint32_t poolId) + void Renderer::RecordSecondaryBuffer(Data::ReadOnlyAtomicArrayQueue* jobQueue, size_t poolId) { CommandHelper* cmdHelper = GetCommandData(poolId); cmdHelper->Reset(); diff --git a/openVulkanoCpp/Vulkan/Renderer.hpp b/openVulkanoCpp/Vulkan/Renderer.hpp index 064e1c6..718356d 100644 --- a/openVulkanoCpp/Vulkan/Renderer.hpp +++ b/openVulkanoCpp/Vulkan/Renderer.hpp @@ -65,7 +65,7 @@ namespace OpenVulkano::Vulkan Scene::UI::Ui* GetActiveUi() override { return uiRenderer.GetActiveUi(); } - CommandHelper* GetCommandData(uint32_t poolId); + CommandHelper* GetCommandData(size_t poolId); static void RunThread(Renderer* renderer, Data::ReadOnlyAtomicArrayQueue* jobQueue, uint32_t id); @@ -77,7 +77,7 @@ namespace OpenVulkano::Vulkan void Render(); - void RecordSecondaryBuffer(Data::ReadOnlyAtomicArrayQueue* jobQueue, uint32_t poolId); + void RecordSecondaryBuffer(Data::ReadOnlyAtomicArrayQueue* jobQueue, size_t poolId); ResourceManager& GetResourceManager() { return resourceManager; } diff --git a/openVulkanoCpp/Vulkan/Resources/ManagedBuffer.hpp b/openVulkanoCpp/Vulkan/Resources/ManagedBuffer.hpp index 998a7fc..7689741 100644 --- a/openVulkanoCpp/Vulkan/Resources/ManagedBuffer.hpp +++ b/openVulkanoCpp/Vulkan/Resources/ManagedBuffer.hpp @@ -55,7 +55,7 @@ namespace OpenVulkano::Vulkan * \return The pointer to the mapped buffer. */ template - T* Map(size_t offset = 0, vk::DeviceSize size = VK_WHOLE_SIZE, bool longTermMapping = true) + T* Map(vk::DeviceSize offset = 0, vk::DeviceSize size = VK_WHOLE_SIZE, bool longTermMapping = true) { if (!mapped) { @@ -106,7 +106,7 @@ namespace OpenVulkano::Vulkan } } - void Copy(const void* data, uint32_t size, uint32_t offset) + void Copy(const void* data, vk::DeviceSize size, vk::DeviceSize offset) { if(mapped) memcpy(static_cast(mapped) + offset, data, size); else diff --git a/openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp b/openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp index b675728..fc851aa 100644 --- a/openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp +++ b/openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp @@ -70,12 +70,12 @@ namespace OpenVulkano::Vulkan if (shader->vertexInputDescriptions.size() == 1) { // Reuse already existing vertex attribute description static_assert(sizeof(VertexInputParameter) == sizeof(vk::VertexInputAttributeDescription)); - attributeDescriptionsSize = shader->vertexInputDescriptions[0].inputParameters.size(); + attributeDescriptionsSize = static_cast(shader->vertexInputDescriptions[0].inputParameters.size()); attributeDescriptionsData = reinterpret_cast(shader->vertexInputDescriptions[0].inputParameters.data()); } else { - attributeDescriptionsSize = attributeDescriptions.size(); + attributeDescriptionsSize = static_cast(attributeDescriptions.size()); attributeDescriptionsData = attributeDescriptions.data(); }