diff --git a/CMakeLists.txt b/CMakeLists.txt index 056635f..497c078 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,7 @@ if (WIN32) add_compile_definitions( _CRT_SECURE_NO_WARNINGS NOMINMAX + WIN32_LEAN_AND_MEAN ) endif () diff --git a/engine/src/drivers/vulkan/render_driver.cpp b/engine/src/drivers/vulkan/render_driver.cpp index 0e64cc9..81590f5 100644 --- a/engine/src/drivers/vulkan/render_driver.cpp +++ b/engine/src/drivers/vulkan/render_driver.cpp @@ -64,7 +64,7 @@ std::string VulkanRenderDriver::get_api_version_string() const { } u32 VulkanRenderDriver::get_device_count() const { - return m_devices.size(); + return static_cast(m_devices.size()); } const RenderDevice& VulkanRenderDriver::get_device(const u32 index) const { @@ -200,9 +200,9 @@ void VulkanRenderDriver::_init_instance() { VkInstanceCreateInfo create {}; create.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; create.pApplicationInfo = &appinfo; - create.enabledLayerCount = m_layers.size(); + create.enabledLayerCount = static_cast(m_layers.size()); create.ppEnabledLayerNames = m_layers.data(); - create.enabledExtensionCount = m_extensions.size(); + create.enabledExtensionCount = static_cast(m_extensions.size()); create.ppEnabledExtensionNames = m_extensions.data(); if (vkCreateInstance(&create, _get_allocator(VK_OBJECT_TYPE_INSTANCE), &m_instance) != VK_SUCCESS) { @@ -328,11 +328,11 @@ void VulkanRenderDriver::_init_device(const std::vector VkDeviceCreateInfo create {}; create.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; - create.enabledLayerCount = m_layers.size(); + create.enabledLayerCount = static_cast(m_layers.size()); create.ppEnabledLayerNames = m_layers.data(); - create.enabledExtensionCount = m_device_extensions.size(); + create.enabledExtensionCount = static_cast(m_device_extensions.size()); create.ppEnabledExtensionNames = m_device_extensions.data(); - create.queueCreateInfoCount = queues.size(); + create.queueCreateInfoCount = static_cast(queues.size()); create.pQueueCreateInfos = queues.data(); create.pEnabledFeatures = &m_features; // TODO: pNext for additional features