sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VulkanRenderer: Improve pixel format handling

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-02-27 18:41:43 +01:00
parent 8a097afb1b
commit 55a5ae0648
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/Nazara/VulkanRenderer/Utils.inl
View File

@@ -256,6 +256,7 @@ namespace Nz
case PixelFormat::BGRA8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB; case PixelFormat::BGRA8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB;
case PixelFormat::Depth16: return VK_FORMAT_D16_UNORM; case PixelFormat::Depth16: return VK_FORMAT_D16_UNORM;
case PixelFormat::Depth16Stencil8: return VK_FORMAT_D16_UNORM_S8_UINT; case PixelFormat::Depth16Stencil8: return VK_FORMAT_D16_UNORM_S8_UINT;
case PixelFormat::Depth24: return VK_FORMAT_UNDEFINED;
case PixelFormat::Depth24Stencil8: return VK_FORMAT_D24_UNORM_S8_UINT; case PixelFormat::Depth24Stencil8: return VK_FORMAT_D24_UNORM_S8_UINT;
case PixelFormat::Depth32F: return VK_FORMAT_D32_SFLOAT; case PixelFormat::Depth32F: return VK_FORMAT_D32_SFLOAT;
case PixelFormat::Depth32FStencil8: return VK_FORMAT_D32_SFLOAT_S8_UINT; case PixelFormat::Depth32FStencil8: return VK_FORMAT_D32_SFLOAT_S8_UINT;
@@ -265,11 +266,15 @@ namespace Nz
case PixelFormat::RGBA8_SRGB: return VK_FORMAT_R8G8B8A8_SRGB; case PixelFormat::RGBA8_SRGB: return VK_FORMAT_R8G8B8A8_SRGB;
case PixelFormat::RGBA16F: return VK_FORMAT_R16G16B16A16_SFLOAT; case PixelFormat::RGBA16F: return VK_FORMAT_R16G16B16A16_SFLOAT;
case PixelFormat::RGBA32F: return VK_FORMAT_R32G32B32A32_SFLOAT; case PixelFormat::RGBA32F: return VK_FORMAT_R32G32B32A32_SFLOAT;
case PixelFormat::Stencil1: return VK_FORMAT_UNDEFINED;
case PixelFormat::Stencil4: return VK_FORMAT_UNDEFINED;
case PixelFormat::Stencil8: return VK_FORMAT_S8_UINT;
case PixelFormat::Stencil16: return VK_FORMAT_UNDEFINED;
default: break; default: break;
} }
NazaraError("Unhandled PixelFormat 0x" + NumberToString(UnderlyingCast(pixelFormat), 16)); NazaraError("Unhandled PixelFormat 0x" + NumberToString(UnderlyingCast(pixelFormat), 16));
return {}; return VK_FORMAT_UNDEFINED;
} }
VkImageAspectFlags ToVulkan(PixelFormatContent pixelFormatContent) VkImageAspectFlags ToVulkan(PixelFormatContent pixelFormatContent)

6
src/Nazara/VulkanRenderer/VulkanDevice.cpp
View File

@@ -91,6 +91,10 @@ namespace Nz
bool VulkanDevice::IsTextureFormatSupported(PixelFormat format, TextureUsage usage) const bool VulkanDevice::IsTextureFormatSupported(PixelFormat format, TextureUsage usage) const
{ {
VkFormat vulkanFormat = ToVulkan(format);
if (vulkanFormat == VK_FORMAT_UNDEFINED)
return false;
VkFormatFeatureFlags flags = 0; VkFormatFeatureFlags flags = 0;
switch (usage) switch (usage)
{ {
@@ -116,7 +120,7 @@ namespace Nz
break; break;
} }
VkFormatProperties formatProperties = GetInstance().GetPhysicalDeviceFormatProperties(GetPhysicalDevice(), ToVulkan(format)); VkFormatProperties formatProperties = GetInstance().GetPhysicalDeviceFormatProperties(GetPhysicalDevice(), vulkanFormat);
return formatProperties.optimalTilingFeatures & flags; //< Assume optimal tiling return formatProperties.optimalTilingFeatures & flags; //< Assume optimal tiling
} }
} }