diff --git a/inc/hgl/graph/vulkan/VK.h b/inc/hgl/graph/vulkan/VK.h index a49f4670..87de8fc2 100644 --- a/inc/hgl/graph/vulkan/VK.h +++ b/inc/hgl/graph/vulkan/VK.h @@ -61,6 +61,12 @@ class VertexAttributeBinding; class Renderable; +enum class SharingMode +{ + Exclusive = 0, + Concurrent +};// + enum class ShaderStageBit { Vertex =VK_SHADER_STAGE_VERTEX_BIT, diff --git a/src/RenderDevice/Vulkan/VKDeviceImage.cpp b/src/RenderDevice/Vulkan/VKDeviceImage.cpp index 1bfcb833..a130dc3f 100644 --- a/src/RenderDevice/Vulkan/VKDeviceImage.cpp +++ b/src/RenderDevice/Vulkan/VKDeviceImage.cpp @@ -11,7 +11,7 @@ namespace imageCreateInfo.mipLevels = 1; imageCreateInfo.arrayLayers = 1; imageCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT; - imageCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + imageCreateInfo.sharingMode = VkSharingMode(SharingMode::Exclusive); imageCreateInfo.queueFamilyIndexCount = 0; imageCreateInfo.pQueueFamilyIndices = nullptr; imageCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -37,7 +37,7 @@ VkImage Device::CreateImage1D(const VkFormat format,const uint32_t length,const imageCreateInfo.arrayLayers = 1; imageCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT; imageCreateInfo.usage = usage; - imageCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + imageCreateInfo.sharingMode = VkSharingMode(SharingMode::Exclusive); imageCreateInfo.queueFamilyIndexCount = 0; imageCreateInfo.pQueueFamilyIndices = nullptr; imageCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -70,7 +70,7 @@ VkImage Device::CreateImage1DArray(const VkFormat format,const uint32_t length,c imageCreateInfo.arrayLayers = layer; imageCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT; imageCreateInfo.usage = usage; - imageCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + imageCreateInfo.sharingMode = VkSharingMode(SharingMode::Exclusive); imageCreateInfo.queueFamilyIndexCount = 0; imageCreateInfo.pQueueFamilyIndices = nullptr; imageCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -103,7 +103,7 @@ VkImage Device::CreateImage2D(const VkFormat format,const uint32_t width,const u imageCreateInfo.arrayLayers = 1; imageCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT; imageCreateInfo.usage = usage; - imageCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + imageCreateInfo.sharingMode = VkSharingMode(SharingMode::Exclusive); imageCreateInfo.queueFamilyIndexCount = 0; imageCreateInfo.pQueueFamilyIndices = nullptr; imageCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -136,7 +136,7 @@ VkImage Device::CreateImage2DArray(const VkFormat format,const uint32_t width,co imageCreateInfo.arrayLayers = layer; imageCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT; imageCreateInfo.usage = usage; - imageCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + imageCreateInfo.sharingMode = VkSharingMode(SharingMode::Exclusive); imageCreateInfo.queueFamilyIndexCount = 0; imageCreateInfo.pQueueFamilyIndices = nullptr; imageCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -169,7 +169,7 @@ VkImage Device::CreateImage3D(const VkFormat format,const uint32_t width,const u imageCreateInfo.arrayLayers = 1; imageCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT; imageCreateInfo.usage = usage; - imageCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + imageCreateInfo.sharingMode = VkSharingMode(SharingMode::Exclusive); imageCreateInfo.queueFamilyIndexCount = 0; imageCreateInfo.pQueueFamilyIndices = nullptr; imageCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -202,7 +202,7 @@ VkImage Device::CreateCubemap(const VkFormat format,const uint32_t width,const u imageCreateInfo.arrayLayers = 6; imageCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT; imageCreateInfo.usage = usage; - imageCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + imageCreateInfo.sharingMode = VkSharingMode(SharingMode::Exclusive); imageCreateInfo.queueFamilyIndexCount = 0; imageCreateInfo.pQueueFamilyIndices = nullptr; imageCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; diff --git a/src/RenderDevice/Vulkan/VKDeviceSwapchain.cpp b/src/RenderDevice/Vulkan/VKDeviceSwapchain.cpp index 587d4e59..f20e294c 100644 --- a/src/RenderDevice/Vulkan/VKDeviceSwapchain.cpp +++ b/src/RenderDevice/Vulkan/VKDeviceSwapchain.cpp @@ -56,7 +56,7 @@ namespace } else { - swapchain_ci.imageSharingMode=VK_SHARING_MODE_EXCLUSIVE; + swapchain_ci.imageSharingMode = VkSharingMode(SharingMode::Exclusive); } VkSwapchainKHR swap_chain;