summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineVulkan
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-03-25 00:36:38 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-03-25 00:36:38 +0000
commit0c5090e05e7c36f33e3f77db0eb823d982b06b89 (patch)
treec87ee1e6f22ba20bf594968f050c6204bb0aa4bd /Graphics/GraphicsEngineVulkan
parentFirst implemenation of Swap chain initialization in Vulkan (diff)
downloadDiligentCore-0c5090e05e7c36f33e3f77db0eb823d982b06b89.tar.gz
DiligentCore-0c5090e05e7c36f33e3f77db0eb823d982b06b89.zip
Added vulkan texture type conversions + texture view initialization
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
-rw-r--r--Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h1
-rw-r--r--Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.h10
-rw-r--r--Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h16
-rw-r--r--Graphics/GraphicsEngineVulkan/include/VulkanTypeConversions.h4
-rw-r--r--Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp139
-rw-r--r--Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp434
6 files changed, 541 insertions, 63 deletions
diff --git a/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h b/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h
index b7a1558a..8dbb6918 100644
--- a/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h
@@ -63,6 +63,7 @@ private:
std::shared_ptr<VulkanUtilities::VulkanInstance> m_VulkanInstance;
VkSurfaceKHR m_VkSurface = VK_NULL_HANDLE;
VkSwapchainKHR m_VkSwapChain = VK_NULL_HANDLE;
+ VkFormat m_VkColorFormat = VK_FORMAT_UNDEFINED;
//std::vector< RefCntAutoPtr<ITextureViewVk>, STDAllocatorRawMem<RefCntAutoPtr<ITextureViewVk>> > m_pBackBufferRTV;
//RefCntAutoPtr<ITextureViewVk> m_pDepthBufferDSV;
diff --git a/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.h b/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.h
index 74ec46ae..f8411711 100644
--- a/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.h
@@ -42,11 +42,11 @@ public:
typedef TextureViewBase<ITextureViewVk> TTextureViewBase;
TextureViewVkImpl( IReferenceCounters *pRefCounters,
- IRenderDevice *pDevice,
- const TextureViewDesc& ViewDesc,
- class ITexture *pTexture,
- DescriptorHeapAllocation &&HandleAlloc,
- bool bIsDefaultView);
+ IRenderDevice *pDevice,
+ const TextureViewDesc& ViewDesc,
+ class ITexture *pTexture,
+ DescriptorHeapAllocation &&HandleAlloc,
+ bool bIsDefaultView);
virtual void QueryInterface( const Diligent::INTERFACE_ID &IID, IObject **ppInterface )override;
diff --git a/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h b/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h
index 96065658..f050afdc 100644
--- a/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h
@@ -46,16 +46,16 @@ public:
// Creates a new Vk resource
TextureVkImpl(IReferenceCounters *pRefCounters,
- FixedBlockMemoryAllocator &TexViewObjAllocator,
- class RenderDeviceVkImpl *pDeviceVk,
- const TextureDesc& TexDesc,
- const TextureData &InitData = TextureData());
+ FixedBlockMemoryAllocator &TexViewObjAllocator,
+ class RenderDeviceVkImpl *pDeviceVk,
+ const TextureDesc& TexDesc,
+ const TextureData &InitData = TextureData());
// Attaches to an existing Vk resource
TextureVkImpl(IReferenceCounters *pRefCounters,
- FixedBlockMemoryAllocator &TexViewObjAllocator,
- class RenderDeviceVkImpl *pDeviceVk,
- const TextureDesc& TexDesc,
- void *pTexture);
+ FixedBlockMemoryAllocator &TexViewObjAllocator,
+ class RenderDeviceVkImpl *pDeviceVk,
+ const TextureDesc& TexDesc,
+ void *pTexture);
~TextureVkImpl();
virtual void QueryInterface( const Diligent::INTERFACE_ID &IID, IObject **ppInterface )override;
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanTypeConversions.h b/Graphics/GraphicsEngineVulkan/include/VulkanTypeConversions.h
index edc9a51d..76739fb1 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanTypeConversions.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanTypeConversions.h
@@ -30,6 +30,10 @@
namespace Diligent
{
+
+VkFormat TexFormatToVkFormat(TEXTURE_FORMAT TexFmt);
+TEXTURE_FORMAT VkFormatToTexFormat(VkFormat VkFmt);
+
#if 0
D3D12_COMPARISON_FUNC ComparisonFuncToD3D12ComparisonFunc(COMPARISON_FUNCTION Func);
D3D12_FILTER FilterTypeToD3D12Filter(FILTER_TYPE MinFilter, FILTER_TYPE MagFilter, FILTER_TYPE MipFilter);
diff --git a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
index dad28ae1..3473b73e 100644
--- a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
@@ -25,7 +25,7 @@
#include "SwapChainVkImpl.h"
#include "RenderDeviceVkImpl.h"
#include "DeviceContextVkImpl.h"
-//#include "DXGITypeConversions.h"
+#include "VulkanTypeConversions.h"
#include "TextureVkImpl.h"
#include "EngineMemory.h"
@@ -103,18 +103,45 @@ SwapChainVkImpl::SwapChainVkImpl(IReferenceCounters *pRefCounters,
err = vkGetPhysicalDeviceSurfaceFormatsKHR(vkDeviceHandle, m_VkSurface, &formatCount, SupportedFormats.data());
CHECK_VK_ERROR_AND_THROW(err, "Failed to query supported format properties");
VERIFY_EXPR(formatCount == SupportedFormats.size());
- // If the format list includes just one entry of VK_FORMAT_UNDEFINED,
- // the surface has no preferred format. Otherwise, at least one
- // supported format will be returned.
- VkFormat vkBackBufferFormat = VK_FORMAT_UNDEFINED;
- if (formatCount == 1 && SupportedFormats[0].format == VK_FORMAT_UNDEFINED) {
- //info.format = VK_FORMAT_B8G8R8A8_UNORM;
- //auto DXGIColorBuffFmt = TexFormatToDXGI_Format(m_SwapChainDesc.ColorBufferFormat);
+ m_VkColorFormat = TexFormatToVkFormat(m_SwapChainDesc.ColorBufferFormat);
+ if (formatCount == 1 && SupportedFormats[0].format == VK_FORMAT_UNDEFINED)
+ {
+ // If the format list includes just one entry of VK_FORMAT_UNDEFINED,
+ // the surface has no preferred format. Otherwise, at least one
+ // supported format will be returned.
+
+ // Do nothing
}
- else {
- //assert(formatCount >= 1);
- //info.format = surfFormats[0].format;
- vkBackBufferFormat = SupportedFormats[0].format;
+ else
+ {
+ bool FmtFound = std::find_if(SupportedFormats.begin(), SupportedFormats.end(),
+ [&](const VkSurfaceFormatKHR &SrfFmt){return SrfFmt.format == m_VkColorFormat;}) != SupportedFormats.end();
+ if(!FmtFound)
+ {
+ VkFormat VkReplacementColorFormat = VK_FORMAT_UNDEFINED;
+ switch(m_VkColorFormat)
+ {
+ case VK_FORMAT_R8G8B8A8_UNORM: VkReplacementColorFormat = VK_FORMAT_B8G8R8A8_UNORM; break;
+ case VK_FORMAT_B8G8R8A8_UNORM: VkReplacementColorFormat = VK_FORMAT_R8G8B8A8_UNORM; break;
+ case VK_FORMAT_B8G8R8A8_SRGB: VkReplacementColorFormat = VK_FORMAT_R8G8B8A8_SRGB; break;
+ case VK_FORMAT_R8G8B8A8_SRGB: VkReplacementColorFormat = VK_FORMAT_B8G8R8A8_SRGB; break;
+ default: VkReplacementColorFormat = VK_FORMAT_UNDEFINED;
+ }
+
+ bool ReplacementFmtFound = std::find_if(SupportedFormats.begin(), SupportedFormats.end(),
+ [&](const VkSurfaceFormatKHR &SrfFmt) {return SrfFmt.format == VkReplacementColorFormat; }) != SupportedFormats.end();
+ if(ReplacementFmtFound)
+ {
+ m_VkColorFormat = VkReplacementColorFormat;
+ auto NewColorBufferFormat = VkFormatToTexFormat(VkReplacementColorFormat);
+ LOG_INFO_MESSAGE("Requested color buffer format ", GetTextureFormatAttribs(m_SwapChainDesc.ColorBufferFormat).Name, " is not supported by the surace, and will be replaced with ", GetTextureFormatAttribs(NewColorBufferFormat).Name);
+ m_SwapChainDesc.ColorBufferFormat = NewColorBufferFormat;
+ }
+ else
+ {
+ LOG_WARNING_MESSAGE("Requested color buffer format ", GetTextureFormatAttribs(m_SwapChainDesc.ColorBufferFormat).Name ,"is not supported by the surace");
+ }
+ }
}
VkSurfaceCapabilitiesKHR surfCapabilities = {};
@@ -130,7 +157,7 @@ SwapChainVkImpl::SwapChainVkImpl(IReferenceCounters *pRefCounters,
CHECK_VK_ERROR_AND_THROW(err, "Failed to query surface present modes");
VERIFY_EXPR(presentModeCount == presentModes.size());
- VkExtent2D swapchainExtent;
+ VkExtent2D swapchainExtent = {};
// width and height are either both 0xFFFFFFFF, or both not 0xFFFFFFFF.
if (surfCapabilities.currentExtent.width == 0xFFFFFFFF) {
// If the surface size is undefined, the size is set to
@@ -202,7 +229,7 @@ SwapChainVkImpl::SwapChainVkImpl(IReferenceCounters *pRefCounters,
swapchain_ci.pNext = NULL;
swapchain_ci.surface = m_VkSurface;
swapchain_ci.minImageCount = desiredNumberOfSwapChainImages;
- swapchain_ci.imageFormat = vkBackBufferFormat;
+ swapchain_ci.imageFormat = m_VkColorFormat;
swapchain_ci.imageExtent.width = swapchainExtent.width;
swapchain_ci.imageExtent.height = swapchainExtent.height;
swapchain_ci.preTransform = preTransform;
@@ -231,29 +258,62 @@ SwapChainVkImpl::SwapChainVkImpl(IReferenceCounters *pRefCounters,
err = vkCreateSwapchainKHR(LogicalVkDevice, &swapchain_ci, NULL, &m_VkSwapChain);
CHECK_VK_ERROR_AND_THROW(err, "Failed to create Vulkan swapchain");
-#if 0
- res = vkGetSwapchainImagesKHR(info.device, info.swap_chain, &info.swapchainImageCount, NULL);
- assert(res == VK_SUCCESS);
+ uint32_t swapchainImageCount = 0;
+ err = vkGetSwapchainImagesKHR(LogicalVkDevice, m_VkSwapChain, &swapchainImageCount, NULL);
+ CHECK_VK_ERROR_AND_THROW(err, "Failed to request swap chain image count");
+ VERIFY_EXPR(swapchainImageCount > 0);
+ if (swapchainImageCount != m_SwapChainDesc.BufferCount)
+ {
+ LOG_INFO_MESSAGE("Actual number of images in the created swap chain: ", m_SwapChainDesc.BufferCount);
+ m_SwapChainDesc.BufferCount = swapchainImageCount;
+ }
- VkImage *swapchainImages = (VkImage *)malloc(info.swapchainImageCount * sizeof(VkImage));
- assert(swapchainImages);
- res = vkGetSwapchainImagesKHR(info.device, info.swap_chain, &info.swapchainImageCount, swapchainImages);
- assert(res == VK_SUCCESS);
+ InitBuffersAndViews();
+}
- info.buffers.resize(info.swapchainImageCount);
- for (uint32_t i = 0; i < info.swapchainImageCount; i++) {
- info.buffers[i].image = swapchainImages[i];
+SwapChainVkImpl::~SwapChainVkImpl()
+{
+ if(m_VkSwapChain != VK_NULL_HANDLE)
+ {
+ auto *pDeviceVkImpl = ValidatedCast<RenderDeviceVkImpl>(m_pRenderDevice.RawPtr());
+ vkDestroySwapchainKHR(pDeviceVkImpl->GetVkDevice(), m_VkSwapChain, NULL);
}
- free(swapchainImages);
+}
- for (uint32_t i = 0; i < info.swapchainImageCount; i++) {
+void SwapChainVkImpl::InitBuffersAndViews()
+{
+ auto *pDeviceVkImpl = ValidatedCast<RenderDeviceVkImpl>(m_pRenderDevice.RawPtr());
+ auto LogicalVkDevice = pDeviceVkImpl->GetVkDevice();
+
+#ifdef _DEBUG
+ {
+ uint32_t swapchainImageCount = 0;
+ auto err = vkGetSwapchainImagesKHR(LogicalVkDevice, m_VkSwapChain, &swapchainImageCount, NULL);
+ VERIFY_EXPR(err == VK_SUCCESS);
+ VERIFY(swapchainImageCount == m_SwapChainDesc.BufferCount, "Unexpected swap chain buffer count");
+ }
+#endif
+
+ uint32_t swapchainImageCount = m_SwapChainDesc.BufferCount;
+ std::vector<VkImage> swapchainImages(swapchainImageCount);
+ auto err = vkGetSwapchainImagesKHR(LogicalVkDevice, m_VkSwapChain, &swapchainImageCount, swapchainImages.data());
+ CHECK_VK_ERROR_AND_THROW(err, "Failed to get swap chain images");
+ VERIFY_EXPR(swapchainImageCount == swapchainImages.size());
+
+ //info.buffers.resize(info.swapchainImageCount);
+ //for (uint32_t i = 0; i < info.swapchainImageCount; i++) {
+ // info.buffers[i].image = swapchainImages[i];
+ //}
+ //free(swapchainImages);
+
+ for (uint32_t i = 0; i < swapchainImageCount; i++) {
VkImageViewCreateInfo color_image_view = {};
color_image_view.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
color_image_view.pNext = NULL;
color_image_view.flags = 0;
- color_image_view.image = info.buffers[i].image;
+ color_image_view.image = swapchainImages[i];
color_image_view.viewType = VK_IMAGE_VIEW_TYPE_2D;
- color_image_view.format = info.format;
+ color_image_view.format = m_VkColorFormat;
color_image_view.components.r = VK_COMPONENT_SWIZZLE_R;
color_image_view.components.g = VK_COMPONENT_SWIZZLE_G;
color_image_view.components.b = VK_COMPONENT_SWIZZLE_B;
@@ -264,33 +324,20 @@ SwapChainVkImpl::SwapChainVkImpl(IReferenceCounters *pRefCounters,
color_image_view.subresourceRange.baseArrayLayer = 0;
color_image_view.subresourceRange.layerCount = 1;
- res = vkCreateImageView(info.device, &color_image_view, NULL, &info.buffers[i].view);
- assert(res == VK_SUCCESS);
+ VkImageView vkImgView = VK_NULL_HANDLE;
+ err = vkCreateImageView(LogicalVkDevice, &color_image_view, NULL, &vkImgView);
+ CHECK_VK_ERROR_AND_THROW(err, "Failed to create view for a swap chain image");
}
+#if 0
/* VULKAN_KEY_END */
/* Clean Up */
for (uint32_t i = 0; i < info.swapchainImageCount; i++) {
- vkDestroyImageView(info.device, info.buffers[i].view, NULL);
+ vkDestroyImageView(LogicalVkDevice, info.buffers[i].view, NULL);
}
-
#endif
- InitBuffersAndViews();
-}
-
-SwapChainVkImpl::~SwapChainVkImpl()
-{
- if(m_VkSwapChain != VK_NULL_HANDLE)
- {
- auto *pDeviceVkImpl = ValidatedCast<RenderDeviceVkImpl>(m_pRenderDevice.RawPtr());
- vkDestroySwapchainKHR(pDeviceVkImpl->GetVkDevice(), m_VkSwapChain, NULL);
- }
-}
-
-void SwapChainVkImpl::InitBuffersAndViews()
-{
#if 0
m_pBackBufferRTV.resize(m_SwapChainDesc.BufferCount);
for(Uint32 backbuff = 0; backbuff < m_SwapChainDesc.BufferCount; ++backbuff)
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp
index 77c22c26..e5d7177f 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp
@@ -22,16 +22,442 @@
*/
#include "pch.h"
-#include "VulkanTypeConversions.h"
-//#include "DXGITypeConversions.h"
+#include <unordered_map>
+#include "VulkanTypeConversions.h"
#include "VulkanTypeDefinitions.h"
-//#include "VulkanTypeConversionImpl.h"
-//#include "D3DViewDescConversionImpl.h"
namespace Diligent
{
+class TexFormatToVkFormatMapper
+{
+public:
+ TexFormatToVkFormatMapper()
+ {
+ m_FmtToVkFmtMap[TEX_FORMAT_UNKNOWN] = VK_FORMAT_UNDEFINED;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA32_TYPELESS] = VK_FORMAT_R32G32B32A32_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA32_FLOAT] = VK_FORMAT_R32G32B32A32_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA32_UINT] = VK_FORMAT_R32G32B32A32_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA32_SINT] = VK_FORMAT_R32G32B32A32_SINT;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_RGB32_TYPELESS] = VK_FORMAT_R32G32B32_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGB32_FLOAT] = VK_FORMAT_R32G32B32_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGB32_UINT] = VK_FORMAT_R32G32B32_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGB32_SINT] = VK_FORMAT_R32G32B32_SINT;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA16_TYPELESS] = VK_FORMAT_R16G16B16A16_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA16_FLOAT] = VK_FORMAT_R16G16B16A16_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA16_UNORM] = VK_FORMAT_R16G16B16A16_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA16_UINT] = VK_FORMAT_R16G16B16A16_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA16_SNORM] = VK_FORMAT_R16G16B16A16_SNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA16_SINT] = VK_FORMAT_R16G16B16A16_SINT;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_RG32_TYPELESS] = VK_FORMAT_R32G32_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RG32_FLOAT] = VK_FORMAT_R32G32_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RG32_UINT] = VK_FORMAT_R32G32_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RG32_SINT] = VK_FORMAT_R32G32_SINT;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_R32G8X24_TYPELESS] = VK_FORMAT_D32_SFLOAT_S8_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_D32_FLOAT_S8X24_UINT] = VK_FORMAT_D32_SFLOAT_S8_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_R32_FLOAT_X8X24_TYPELESS] = VK_FORMAT_D32_SFLOAT_S8_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_X32_TYPELESS_G8X24_UINT] = VK_FORMAT_UNDEFINED;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_RGB10A2_TYPELESS] = VK_FORMAT_A2R10G10B10_UNORM_PACK32;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGB10A2_UNORM] = VK_FORMAT_A2R10G10B10_UNORM_PACK32;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGB10A2_UINT] = VK_FORMAT_A2R10G10B10_UINT_PACK32;
+ m_FmtToVkFmtMap[TEX_FORMAT_R11G11B10_FLOAT] = VK_FORMAT_B10G11R11_UFLOAT_PACK32;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA8_TYPELESS] = VK_FORMAT_R8G8B8A8_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA8_UNORM] = VK_FORMAT_R8G8B8A8_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA8_UNORM_SRGB] = VK_FORMAT_R8G8B8A8_SRGB;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA8_UINT] = VK_FORMAT_R8G8B8A8_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA8_SNORM] = VK_FORMAT_R8G8B8A8_SNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_RGBA8_SINT] = VK_FORMAT_R8G8B8A8_SINT;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_RG16_TYPELESS] = VK_FORMAT_R16G16_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RG16_FLOAT] = VK_FORMAT_R16G16_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RG16_UNORM] = VK_FORMAT_R16G16_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_RG16_UINT] = VK_FORMAT_R16G16_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RG16_SNORM] = VK_FORMAT_R16G16_SNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_RG16_SINT] = VK_FORMAT_R16G16_SINT;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_R32_TYPELESS] = VK_FORMAT_R32_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_D32_FLOAT] = VK_FORMAT_D32_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_R32_FLOAT] = VK_FORMAT_R32_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_R32_UINT] = VK_FORMAT_R32_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_R32_SINT] = VK_FORMAT_R32_SINT;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_R24G8_TYPELESS] = VK_FORMAT_D24_UNORM_S8_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_D24_UNORM_S8_UINT] = VK_FORMAT_D24_UNORM_S8_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_R24_UNORM_X8_TYPELESS] = VK_FORMAT_D24_UNORM_S8_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_X24_TYPELESS_G8_UINT] = VK_FORMAT_UNDEFINED;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_RG8_TYPELESS] = VK_FORMAT_R8G8_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_RG8_UNORM] = VK_FORMAT_R8G8_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_RG8_UINT] = VK_FORMAT_R8G8_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_RG8_SNORM] = VK_FORMAT_R8G8_SNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_RG8_SINT] = VK_FORMAT_R8G8_SINT;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_R16_TYPELESS] = VK_FORMAT_R16_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_R16_FLOAT] = VK_FORMAT_R16_SFLOAT;
+ m_FmtToVkFmtMap[TEX_FORMAT_D16_UNORM] = VK_FORMAT_D16_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_R16_UNORM] = VK_FORMAT_R16_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_R16_UINT] = VK_FORMAT_R16_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_R16_SNORM] = VK_FORMAT_R16_SNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_R16_SINT] = VK_FORMAT_R16_SINT;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_R8_TYPELESS] = VK_FORMAT_R8_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_R8_UNORM] = VK_FORMAT_R8_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_R8_UINT] = VK_FORMAT_R8_UINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_R8_SNORM] = VK_FORMAT_R8_SNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_R8_SINT] = VK_FORMAT_R8_SINT;
+ m_FmtToVkFmtMap[TEX_FORMAT_A8_UNORM] = VK_FORMAT_UNDEFINED;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_R1_UNORM] = VK_FORMAT_UNDEFINED;
+
+ m_FmtToVkFmtMap[TEX_FORMAT_RGB9E5_SHAREDEXP] = VK_FORMAT_E5B9G9R9_UFLOAT_PACK32;
+ m_FmtToVkFmtMap[TEX_FORMAT_RG8_B8G8_UNORM] = VK_FORMAT_UNDEFINED;
+ m_FmtToVkFmtMap[TEX_FORMAT_G8R8_G8B8_UNORM] = VK_FORMAT_UNDEFINED;
+
+ // http://www.g-truc.net/post-0335.html
+ // http://renderingpipeline.com/2012/07/texture-compression/
+ m_FmtToVkFmtMap[TEX_FORMAT_BC1_TYPELESS] = VK_FORMAT_BC1_RGB_UNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC1_UNORM] = VK_FORMAT_BC1_RGB_UNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC1_UNORM_SRGB] = VK_FORMAT_BC1_RGB_SRGB_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC2_TYPELESS] = VK_FORMAT_BC2_UNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC2_UNORM] = VK_FORMAT_BC2_UNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC2_UNORM_SRGB] = VK_FORMAT_BC2_SRGB_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC3_TYPELESS] = VK_FORMAT_BC3_UNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC3_UNORM] = VK_FORMAT_BC3_UNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC3_UNORM_SRGB] = VK_FORMAT_BC3_SRGB_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC4_TYPELESS] = VK_FORMAT_BC4_UNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC4_UNORM] = VK_FORMAT_BC4_UNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC4_SNORM] = VK_FORMAT_BC4_SNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC5_TYPELESS] = VK_FORMAT_BC5_UNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC5_UNORM] = VK_FORMAT_BC5_UNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC5_SNORM] = VK_FORMAT_BC5_SNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_B5G6R5_UNORM] = VK_FORMAT_B5G6R5_UNORM_PACK16;
+ m_FmtToVkFmtMap[TEX_FORMAT_B5G5R5A1_UNORM] = VK_FORMAT_B5G5R5A1_UNORM_PACK16;
+ m_FmtToVkFmtMap[TEX_FORMAT_BGRA8_UNORM] = VK_FORMAT_B8G8R8A8_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_BGRX8_UNORM] = VK_FORMAT_B8G8R8A8_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_R10G10B10_XR_BIAS_A2_UNORM] = VK_FORMAT_UNDEFINED;
+ m_FmtToVkFmtMap[TEX_FORMAT_BGRA8_TYPELESS] = VK_FORMAT_B8G8R8A8_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_BGRA8_UNORM_SRGB] = VK_FORMAT_B8G8R8A8_SRGB;
+ m_FmtToVkFmtMap[TEX_FORMAT_BGRX8_TYPELESS] = VK_FORMAT_B8G8R8A8_UNORM;
+ m_FmtToVkFmtMap[TEX_FORMAT_BGRX8_UNORM_SRGB] = VK_FORMAT_B8G8R8A8_SRGB;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC6H_TYPELESS] = VK_FORMAT_BC6H_UFLOAT_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC6H_UF16] = VK_FORMAT_BC6H_UFLOAT_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC6H_SF16] = VK_FORMAT_BC6H_SFLOAT_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC7_TYPELESS] = VK_FORMAT_BC7_UNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC7_UNORM] = VK_FORMAT_BC7_UNORM_BLOCK;
+ m_FmtToVkFmtMap[TEX_FORMAT_BC7_UNORM_SRGB] = VK_FORMAT_BC7_SRGB_BLOCK;
+ }
+
+ VkFormat operator[](TEXTURE_FORMAT TexFmt)const
+ {
+ VERIFY_EXPR(TexFmt < _countof(m_FmtToVkFmtMap));
+ return m_FmtToVkFmtMap[TexFmt];
+ }
+
+private:
+ VkFormat m_FmtToVkFmtMap[TEX_FORMAT_NUM_FORMATS] = {};
+};
+
+VkFormat TexFormatToVkFormat(TEXTURE_FORMAT TexFmt)
+{
+ static const TexFormatToVkFormatMapper FmtMapper;
+ return FmtMapper[TexFmt];
+}
+
+
+
+class VkFormatToTexFormatMapper
+{
+public:
+ VkFormatToTexFormatMapper()
+ {
+ m_VkFmtToTexFmtMap[VK_FORMAT_UNDEFINED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R4G4_UNORM_PACK8] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R4G4B4A4_UNORM_PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B4G4R4A4_UNORM_PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R5G6B5_UNORM_PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B5G6R5_UNORM_PACK16] = TEX_FORMAT_B5G6R5_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R5G5B5A1_UNORM_PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B5G5R5A1_UNORM_PACK16] = TEX_FORMAT_B5G5R5A1_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A1R5G5B5_UNORM_PACK16] = TEX_FORMAT_UNKNOWN;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8_UNORM] = TEX_FORMAT_R8_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8_SNORM] = TEX_FORMAT_R8_SNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8_USCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8_SSCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8_UINT] = TEX_FORMAT_R8_UINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8_SINT] = TEX_FORMAT_R8_SINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8_SRGB] = TEX_FORMAT_UNKNOWN;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8_UNORM] = TEX_FORMAT_RG8_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8_SNORM] = TEX_FORMAT_RG8_SNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8_USCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8_SSCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8_UINT] = TEX_FORMAT_RG8_UINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8_SINT] = TEX_FORMAT_RG8_SINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8_SRGB] = TEX_FORMAT_UNKNOWN;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8_SNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8_USCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8_SSCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8_UINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8_SINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8_SRGB] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8_SNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8_USCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8_SSCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8_UINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8_SINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8_SRGB] = TEX_FORMAT_UNKNOWN;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8A8_UNORM] = TEX_FORMAT_RGBA8_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8A8_SNORM] = TEX_FORMAT_RGBA8_SNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8A8_USCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8A8_SSCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8A8_UINT] = TEX_FORMAT_RGBA8_UINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8A8_SINT] = TEX_FORMAT_RGBA8_SINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R8G8B8A8_SRGB] = TEX_FORMAT_RGBA8_UNORM_SRGB;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8A8_UNORM] = TEX_FORMAT_BGRA8_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8A8_SNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8A8_USCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8A8_SSCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8A8_UINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8A8_SINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_B8G8R8A8_SRGB] = TEX_FORMAT_BGRA8_UNORM_SRGB;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_A8B8G8R8_UNORM_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A8B8G8R8_SNORM_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A8B8G8R8_USCALED_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A8B8G8R8_SSCALED_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A8B8G8R8_UINT_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A8B8G8R8_SINT_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A8B8G8R8_SRGB_PACK32] = TEX_FORMAT_UNKNOWN;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_A2R10G10B10_UNORM_PACK32] = TEX_FORMAT_RGB10A2_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A2R10G10B10_SNORM_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A2R10G10B10_USCALED_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A2R10G10B10_SSCALED_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A2R10G10B10_UINT_PACK32] = TEX_FORMAT_RGB10A2_UINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A2R10G10B10_SINT_PACK32] = TEX_FORMAT_UNKNOWN;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_A2B10G10R10_UNORM_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A2B10G10R10_SNORM_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A2B10G10R10_USCALED_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A2B10G10R10_SSCALED_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A2B10G10R10_UINT_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_A2B10G10R10_SINT_PACK32] = TEX_FORMAT_UNKNOWN;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16_UNORM] = TEX_FORMAT_R16_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16_SNORM] = TEX_FORMAT_R16_SNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16_USCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16_SSCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16_UINT] = TEX_FORMAT_R16_UINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16_SINT] = TEX_FORMAT_R16_SINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16_SFLOAT] = TEX_FORMAT_R16_FLOAT;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16_UNORM] = TEX_FORMAT_RG16_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16_SNORM] = TEX_FORMAT_RG16_SNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16_USCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16_SSCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16_UINT] = TEX_FORMAT_RG16_UINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16_SINT] = TEX_FORMAT_RG16_SINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16_SFLOAT] = TEX_FORMAT_RG16_FLOAT;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16_SNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16_USCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16_SSCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16_UINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16_SINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16_SFLOAT] = TEX_FORMAT_UNKNOWN;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16A16_UNORM] = TEX_FORMAT_RGBA16_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16A16_SNORM] = TEX_FORMAT_RGBA16_SNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16A16_USCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16A16_SSCALED] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16A16_UINT] = TEX_FORMAT_RGBA16_UINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16A16_SINT] = TEX_FORMAT_RGBA16_SINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R16G16B16A16_SFLOAT] = TEX_FORMAT_RGBA16_FLOAT;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R32_UINT] = TEX_FORMAT_R32_UINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R32_SINT] = TEX_FORMAT_R32_SINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R32_SFLOAT] = TEX_FORMAT_R32_FLOAT;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R32G32_UINT] = TEX_FORMAT_RG32_UINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R32G32_SINT] = TEX_FORMAT_RG32_SINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R32G32_SFLOAT] = TEX_FORMAT_RG32_FLOAT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R32G32B32_UINT] = TEX_FORMAT_RGB32_UINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R32G32B32_SINT] = TEX_FORMAT_RGB32_SINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R32G32B32_SFLOAT] = TEX_FORMAT_RGB32_FLOAT;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R32G32B32A32_UINT] = TEX_FORMAT_RGBA32_UINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R32G32B32A32_SINT] = TEX_FORMAT_RGBA32_SINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R32G32B32A32_SFLOAT] = TEX_FORMAT_RGBA32_FLOAT;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R64_UINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R64_SINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R64_SFLOAT] = TEX_FORMAT_UNKNOWN;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R64G64_UINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R64G64_SINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R64G64_SFLOAT] = TEX_FORMAT_UNKNOWN;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R64G64B64_UINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R64G64B64_SINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R64G64B64_SFLOAT] = TEX_FORMAT_UNKNOWN;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_R64G64B64A64_UINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R64G64B64A64_SINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_R64G64B64A64_SFLOAT] = TEX_FORMAT_UNKNOWN;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_B10G11R11_UFLOAT_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_E5B9G9R9_UFLOAT_PACK32] = TEX_FORMAT_RGB9E5_SHAREDEXP;
+ m_VkFmtToTexFmtMap[VK_FORMAT_D16_UNORM] = TEX_FORMAT_D16_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_X8_D24_UNORM_PACK32] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_D32_SFLOAT] = TEX_FORMAT_D32_FLOAT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_S8_UINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_D16_UNORM_S8_UINT] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_D24_UNORM_S8_UINT] = TEX_FORMAT_D24_UNORM_S8_UINT;
+ m_VkFmtToTexFmtMap[VK_FORMAT_D32_SFLOAT_S8_UINT] = TEX_FORMAT_D32_FLOAT_S8X24_UINT;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC1_RGB_UNORM_BLOCK] = TEX_FORMAT_BC1_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC1_RGB_SRGB_BLOCK] = TEX_FORMAT_BC1_UNORM_SRGB;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC1_RGBA_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC1_RGBA_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC2_UNORM_BLOCK] = TEX_FORMAT_BC2_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC2_SRGB_BLOCK] = TEX_FORMAT_BC2_UNORM_SRGB;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC3_UNORM_BLOCK] = TEX_FORMAT_BC3_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC3_SRGB_BLOCK] = TEX_FORMAT_BC3_UNORM_SRGB;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC4_UNORM_BLOCK] = TEX_FORMAT_BC4_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC4_SNORM_BLOCK] = TEX_FORMAT_BC4_SNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC5_UNORM_BLOCK] = TEX_FORMAT_BC5_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC5_SNORM_BLOCK] = TEX_FORMAT_BC5_SNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC6H_UFLOAT_BLOCK] = TEX_FORMAT_BC6H_UF16;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC6H_SFLOAT_BLOCK] = TEX_FORMAT_BC6H_SF16;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC7_UNORM_BLOCK] = TEX_FORMAT_BC7_UNORM;
+ m_VkFmtToTexFmtMap[VK_FORMAT_BC7_SRGB_BLOCK] = TEX_FORMAT_BC7_UNORM_SRGB;
+
+ m_VkFmtToTexFmtMap[VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_EAC_R11_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_EAC_R11_SNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_EAC_R11G11_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_EAC_R11G11_SNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_4x4_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_4x4_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_5x4_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_5x4_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_5x5_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_5x5_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_6x5_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_6x5_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_6x6_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_6x6_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_8x5_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_8x5_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_8x6_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_8x6_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_8x8_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_8x8_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_10x5_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_10x5_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_10x6_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_10x6_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_10x8_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_10x8_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_10x10_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_10x10_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_12x10_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_12x10_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_12x12_UNORM_BLOCK] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMap[VK_FORMAT_ASTC_12x12_SRGB_BLOCK] = TEX_FORMAT_UNKNOWN;
+
+
+
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G8B8G8R8_422_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_B8G8R8G8_422_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G8_B8R8_2PLANE_420_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G8_B8R8_2PLANE_422_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_R10X6_UNORM_PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_R10X6G10X6_UNORM_2PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_B10X6G10X6R10X6G10X6_422_UNORM_4PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_R12X4_UNORM_PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_R12X4G12X4_UNORM_2PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_B12X4G12X4R12X4G12X4_422_UNORM_4PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G16B16G16R16_422_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_B16G16R16G16_422_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G16_B16R16_2PLANE_420_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G16_B16R16_2PLANE_422_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_PVRTC2_2BPP_UNORM_BLOCK_IMG] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_PVRTC2_4BPP_UNORM_BLOCK_IMG] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_PVRTC1_2BPP_SRGB_BLOCK_IMG] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG] = TEX_FORMAT_UNKNOWN;
+ m_VkFmtToTexFmtMapExt[VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG] = TEX_FORMAT_UNKNOWN;
+ }
+
+ TEXTURE_FORMAT operator[](VkFormat VkFmt)const
+ {
+ if(VkFmt < VK_FORMAT_RANGE_SIZE)
+ {
+ return m_VkFmtToTexFmtMap[VkFmt];
+ }
+ else
+ {
+ auto it = m_VkFmtToTexFmtMapExt.find(VkFmt);
+ return it != m_VkFmtToTexFmtMapExt.end() ? it->second : TEX_FORMAT_UNKNOWN;
+ }
+ }
+
+private:
+ TEXTURE_FORMAT m_VkFmtToTexFmtMap[VK_FORMAT_RANGE_SIZE] = {};
+ std::unordered_map<VkFormat, TEXTURE_FORMAT> m_VkFmtToTexFmtMapExt;
+};
+
+TEXTURE_FORMAT VkFormatToTexFormat(VkFormat VkFmt)
+{
+ static const VkFormatToTexFormatMapper FmtMapper;
+ return FmtMapper[VkFmt];
+}
+
+
+
#if 0
D3D12_COMPARISON_FUNC ComparisonFuncToD3D12ComparisonFunc(COMPARISON_FUNCTION Func)
{