VERY experimental Nintendo Switch 2 emulator
C++
renderer_vulkan: add format fallbacks for R16G16B16_SFLOAT, R16G16B16_SSCALED, R8G8B8_SSCALED
Liambffdc2b3ce9d
diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp b/src/video_core/renderer_vulkan/maxwell_to_vk.cppindex 689164a6a9..7d1431b6d5 100644--- a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp+++ b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp@@ -317,195 +317,204 @@ VkPrimitiveTopology PrimitiveTopology([[maybe_unused]] const Device& device,}}-VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttribute::Size size) {- switch (type) {- case Maxwell::VertexAttribute::Type::UnsignedNorm:- switch (size) {- case Maxwell::VertexAttribute::Size::Size_8:- return VK_FORMAT_R8_UNORM;- case Maxwell::VertexAttribute::Size::Size_8_8:- return VK_FORMAT_R8G8_UNORM;- case Maxwell::VertexAttribute::Size::Size_8_8_8:- return VK_FORMAT_R8G8B8_UNORM;- case Maxwell::VertexAttribute::Size::Size_8_8_8_8:- return VK_FORMAT_R8G8B8A8_UNORM;- case Maxwell::VertexAttribute::Size::Size_16:- return VK_FORMAT_R16_UNORM;- case Maxwell::VertexAttribute::Size::Size_16_16:- return VK_FORMAT_R16G16_UNORM;- case Maxwell::VertexAttribute::Size::Size_16_16_16:- return VK_FORMAT_R16G16B16_UNORM;- case Maxwell::VertexAttribute::Size::Size_16_16_16_16:- return VK_FORMAT_R16G16B16A16_UNORM;- case Maxwell::VertexAttribute::Size::Size_10_10_10_2:- return VK_FORMAT_A2B10G10R10_UNORM_PACK32;- default:+VkFormat VertexFormat(const Device& device, Maxwell::VertexAttribute::Type type,+ Maxwell::VertexAttribute::Size size) {+ const VkFormat format{([&]() {+ switch (type) {+ case Maxwell::VertexAttribute::Type::UnsignedNorm:+ switch (size) {+ case Maxwell::VertexAttribute::Size::Size_8:+ return VK_FORMAT_R8_UNORM;+ case Maxwell::VertexAttribute::Size::Size_8_8:+ return VK_FORMAT_R8G8_UNORM;+ case Maxwell::VertexAttribute::Size::Size_8_8_8:+ return VK_FORMAT_R8G8B8_UNORM;+ case Maxwell::VertexAttribute::Size::Size_8_8_8_8:+ return VK_FORMAT_R8G8B8A8_UNORM;+ case Maxwell::VertexAttribute::Size::Size_16:+ return VK_FORMAT_R16_UNORM;+ case Maxwell::VertexAttribute::Size::Size_16_16:+ return VK_FORMAT_R16G16_UNORM;+ case Maxwell::VertexAttribute::Size::Size_16_16_16:+ return VK_FORMAT_R16G16B16_UNORM;+ case Maxwell::VertexAttribute::Size::Size_16_16_16_16:+ return VK_FORMAT_R16G16B16A16_UNORM;+ case Maxwell::VertexAttribute::Size::Size_10_10_10_2:+ return VK_FORMAT_A2B10G10R10_UNORM_PACK32;+ default:+ break;+ }break;- }- break;- case Maxwell::VertexAttribute::Type::SignedNorm:- switch (size) {- case Maxwell::VertexAttribute::Size::Size_8:- return VK_FORMAT_R8_SNORM;- case Maxwell::VertexAttribute::Size::Size_8_8:- return VK_FORMAT_R8G8_SNORM;- case Maxwell::VertexAttribute::Size::Size_8_8_8:- return VK_FORMAT_R8G8B8_SNORM;- case Maxwell::VertexAttribute::Size::Size_8_8_8_8:- return VK_FORMAT_R8G8B8A8_SNORM;- case Maxwell::VertexAttribute::Size::Size_16:- return VK_FORMAT_R16_SNORM;- case Maxwell::VertexAttribute::Size::Size_16_16:- return VK_FORMAT_R16G16_SNORM;- case Maxwell::VertexAttribute::Size::Size_16_16_16:- return VK_FORMAT_R16G16B16_SNORM;- case Maxwell::VertexAttribute::Size::Size_16_16_16_16:- return VK_FORMAT_R16G16B16A16_SNORM;- case Maxwell::VertexAttribute::Size::Size_10_10_10_2:- return VK_FORMAT_A2B10G10R10_SNORM_PACK32;- default:+ case Maxwell::VertexAttribute::Type::SignedNorm:+ switch (size) {+ case Maxwell::VertexAttribute::Size::Size_8:+ return VK_FORMAT_R8_SNORM;+ case Maxwell::VertexAttribute::Size::Size_8_8:+ return VK_FORMAT_R8G8_SNORM;+ case Maxwell::VertexAttribute::Size::Size_8_8_8:+ return VK_FORMAT_R8G8B8_SNORM;+ case Maxwell::VertexAttribute::Size::Size_8_8_8_8:+ return VK_FORMAT_R8G8B8A8_SNORM;+ case Maxwell::VertexAttribute::Size::Size_16:+ return VK_FORMAT_R16_SNORM;+ case Maxwell::VertexAttribute::Size::Size_16_16:+ return VK_FORMAT_R16G16_SNORM;+ case Maxwell::VertexAttribute::Size::Size_16_16_16:+ return VK_FORMAT_R16G16B16_SNORM;+ case Maxwell::VertexAttribute::Size::Size_16_16_16_16:+ return VK_FORMAT_R16G16B16A16_SNORM;+ case Maxwell::VertexAttribute::Size::Size_10_10_10_2:+ return VK_FORMAT_A2B10G10R10_SNORM_PACK32;+ default:+ break;+ }break;- }- break;- case Maxwell::VertexAttribute::Type::UnsignedScaled:- switch (size) {- case Maxwell::VertexAttribute::Size::Size_8:- return VK_FORMAT_R8_USCALED;- case Maxwell::VertexAttribute::Size::Size_8_8:- return VK_FORMAT_R8G8_USCALED;- case Maxwell::VertexAttribute::Size::Size_8_8_8:- return VK_FORMAT_R8G8B8_USCALED;- case Maxwell::VertexAttribute::Size::Size_8_8_8_8:- return VK_FORMAT_R8G8B8A8_USCALED;- case Maxwell::VertexAttribute::Size::Size_16:- return VK_FORMAT_R16_USCALED;- case Maxwell::VertexAttribute::Size::Size_16_16:- return VK_FORMAT_R16G16_USCALED;- case Maxwell::VertexAttribute::Size::Size_16_16_16:- return VK_FORMAT_R16G16B16_USCALED;- case Maxwell::VertexAttribute::Size::Size_16_16_16_16:- return VK_FORMAT_R16G16B16A16_USCALED;- case Maxwell::VertexAttribute::Size::Size_10_10_10_2:- return VK_FORMAT_A2B10G10R10_USCALED_PACK32;- default:+ case Maxwell::VertexAttribute::Type::UnsignedScaled:+ switch (size) {+ case Maxwell::VertexAttribute::Size::Size_8:+ return VK_FORMAT_R8_USCALED;+ case Maxwell::VertexAttribute::Size::Size_8_8:+ return VK_FORMAT_R8G8_USCALED;+ case Maxwell::VertexAttribute::Size::Size_8_8_8:+ return VK_FORMAT_R8G8B8_USCALED;+ case Maxwell::VertexAttribute::Size::Size_8_8_8_8:+ return VK_FORMAT_R8G8B8A8_USCALED;+ case Maxwell::VertexAttribute::Size::Size_16:+ return VK_FORMAT_R16_USCALED;+ case Maxwell::VertexAttribute::Size::Size_16_16:+ return VK_FORMAT_R16G16_USCALED;+ case Maxwell::VertexAttribute::Size::Size_16_16_16:+ return VK_FORMAT_R16G16B16_USCALED;+ case Maxwell::VertexAttribute::Size::Size_16_16_16_16:+ return VK_FORMAT_R16G16B16A16_USCALED;+ case Maxwell::VertexAttribute::Size::Size_10_10_10_2:+ return VK_FORMAT_A2B10G10R10_USCALED_PACK32;+ default:+ break;+ }break;- }- break;- case Maxwell::VertexAttribute::Type::SignedScaled:- switch (size) {- case Maxwell::VertexAttribute::Size::Size_8:- return VK_FORMAT_R8_SSCALED;- case Maxwell::VertexAttribute::Size::Size_8_8:- return VK_FORMAT_R8G8_SSCALED;- case Maxwell::VertexAttribute::Size::Size_8_8_8:- return VK_FORMAT_R8G8B8_SSCALED;- case Maxwell::VertexAttribute::Size::Size_8_8_8_8:- return VK_FORMAT_R8G8B8A8_SSCALED;- case Maxwell::VertexAttribute::Size::Size_16:- return VK_FORMAT_R16_SSCALED;- case Maxwell::VertexAttribute::Size::Size_16_16:- return VK_FORMAT_R16G16_SSCALED;- case Maxwell::VertexAttribute::Size::Size_16_16_16:- return VK_FORMAT_R16G16B16_SSCALED;- case Maxwell::VertexAttribute::Size::Size_16_16_16_16:- return VK_FORMAT_R16G16B16A16_SSCALED;- case Maxwell::VertexAttribute::Size::Size_10_10_10_2:- return VK_FORMAT_A2B10G10R10_SSCALED_PACK32;- default:+ case Maxwell::VertexAttribute::Type::SignedScaled:+ switch (size) {+ case Maxwell::VertexAttribute::Size::Size_8:+ return VK_FORMAT_R8_SSCALED;+ case Maxwell::VertexAttribute::Size::Size_8_8:+ return VK_FORMAT_R8G8_SSCALED;+ case Maxwell::VertexAttribute::Size::Size_8_8_8:+ return VK_FORMAT_R8G8B8_SSCALED;+ case Maxwell::VertexAttribute::Size::Size_8_8_8_8:+ return VK_FORMAT_R8G8B8A8_SSCALED;+ case Maxwell::VertexAttribute::Size::Size_16:+ return VK_FORMAT_R16_SSCALED;+ case Maxwell::VertexAttribute::Size::Size_16_16:+ return VK_FORMAT_R16G16_SSCALED;+ case Maxwell::VertexAttribute::Size::Size_16_16_16:+ return VK_FORMAT_R16G16B16_SSCALED;+ case Maxwell::VertexAttribute::Size::Size_16_16_16_16:+ return VK_FORMAT_R16G16B16A16_SSCALED;+ case Maxwell::VertexAttribute::Size::Size_10_10_10_2:+ return VK_FORMAT_A2B10G10R10_SSCALED_PACK32;+ default:+ break;+ }break;- }- break;- case Maxwell::VertexAttribute::Type::UnsignedInt:- switch (size) {- case Maxwell::VertexAttribute::Size::Size_8:- return VK_FORMAT_R8_UINT;- case Maxwell::VertexAttribute::Size::Size_8_8:- return VK_FORMAT_R8G8_UINT;- case Maxwell::VertexAttribute::Size::Size_8_8_8:- return VK_FORMAT_R8G8B8_UINT;- case Maxwell::VertexAttribute::Size::Size_8_8_8_8:- return VK_FORMAT_R8G8B8A8_UINT;- case Maxwell::VertexAttribute::Size::Size_16:- return VK_FORMAT_R16_UINT;- case Maxwell::VertexAttribute::Size::Size_16_16:- return VK_FORMAT_R16G16_UINT;- case Maxwell::VertexAttribute::Size::Size_16_16_16:- return VK_FORMAT_R16G16B16_UINT;- case Maxwell::VertexAttribute::Size::Size_16_16_16_16:- return VK_FORMAT_R16G16B16A16_UINT;- case Maxwell::VertexAttribute::Size::Size_32:- return VK_FORMAT_R32_UINT;- case Maxwell::VertexAttribute::Size::Size_32_32:- return VK_FORMAT_R32G32_UINT;- case Maxwell::VertexAttribute::Size::Size_32_32_32:- return VK_FORMAT_R32G32B32_UINT;- case Maxwell::VertexAttribute::Size::Size_32_32_32_32:- return VK_FORMAT_R32G32B32A32_UINT;- case Maxwell::VertexAttribute::Size::Size_10_10_10_2:- return VK_FORMAT_A2B10G10R10_UINT_PACK32;- default:+ case Maxwell::VertexAttribute::Type::UnsignedInt:+ switch (size) {+ case Maxwell::VertexAttribute::Size::Size_8:+ return VK_FORMAT_R8_UINT;+ case Maxwell::VertexAttribute::Size::Size_8_8:+ return VK_FORMAT_R8G8_UINT;+ case Maxwell::VertexAttribute::Size::Size_8_8_8:+ return VK_FORMAT_R8G8B8_UINT;+ case Maxwell::VertexAttribute::Size::Size_8_8_8_8:+ return VK_FORMAT_R8G8B8A8_UINT;+ case Maxwell::VertexAttribute::Size::Size_16:+ return VK_FORMAT_R16_UINT;+ case Maxwell::VertexAttribute::Size::Size_16_16:+ return VK_FORMAT_R16G16_UINT;+ case Maxwell::VertexAttribute::Size::Size_16_16_16:+ return VK_FORMAT_R16G16B16_UINT;+ case Maxwell::VertexAttribute::Size::Size_16_16_16_16:+ return VK_FORMAT_R16G16B16A16_UINT;+ case Maxwell::VertexAttribute::Size::Size_32:+ return VK_FORMAT_R32_UINT;+ case Maxwell::VertexAttribute::Size::Size_32_32:+ return VK_FORMAT_R32G32_UINT;+ case Maxwell::VertexAttribute::Size::Size_32_32_32:+ return VK_FORMAT_R32G32B32_UINT;+ case Maxwell::VertexAttribute::Size::Size_32_32_32_32:+ return VK_FORMAT_R32G32B32A32_UINT;+ case Maxwell::VertexAttribute::Size::Size_10_10_10_2:+ return VK_FORMAT_A2B10G10R10_UINT_PACK32;+ default:+ break;+ }break;- }- break;- case Maxwell::VertexAttribute::Type::SignedInt:- switch (size) {- case Maxwell::VertexAttribute::Size::Size_8:- return VK_FORMAT_R8_SINT;- case Maxwell::VertexAttribute::Size::Size_8_8:- return VK_FORMAT_R8G8_SINT;- case Maxwell::VertexAttribute::Size::Size_8_8_8:- return VK_FORMAT_R8G8B8_SINT;- case Maxwell::VertexAttribute::Size::Size_8_8_8_8:- return VK_FORMAT_R8G8B8A8_SINT;- case Maxwell::VertexAttribute::Size::Size_16:- return VK_FORMAT_R16_SINT;- case Maxwell::VertexAttribute::Size::Size_16_16:- return VK_FORMAT_R16G16_SINT;- case Maxwell::VertexAttribute::Size::Size_16_16_16:- return VK_FORMAT_R16G16B16_SINT;- case Maxwell::VertexAttribute::Size::Size_16_16_16_16:- return VK_FORMAT_R16G16B16A16_SINT;- case Maxwell::VertexAttribute::Size::Size_32:- return VK_FORMAT_R32_SINT;- case Maxwell::VertexAttribute::Size::Size_32_32:- return VK_FORMAT_R32G32_SINT;- case Maxwell::VertexAttribute::Size::Size_32_32_32:- return VK_FORMAT_R32G32B32_SINT;- case Maxwell::VertexAttribute::Size::Size_32_32_32_32:- return VK_FORMAT_R32G32B32A32_SINT;- case Maxwell::VertexAttribute::Size::Size_10_10_10_2:- return VK_FORMAT_A2B10G10R10_SINT_PACK32;- default:+ case Maxwell::VertexAttribute::Type::SignedInt:+ switch (size) {+ case Maxwell::VertexAttribute::Size::Size_8:+ return VK_FORMAT_R8_SINT;+ case Maxwell::VertexAttribute::Size::Size_8_8:+ return VK_FORMAT_R8G8_SINT;+ case Maxwell::VertexAttribute::Size::Size_8_8_8:+ return VK_FORMAT_R8G8B8_SINT;+ case Maxwell::VertexAttribute::Size::Size_8_8_8_8:+ return VK_FORMAT_R8G8B8A8_SINT;+ case Maxwell::VertexAttribute::Size::Size_16:+ return VK_FORMAT_R16_SINT;+ case Maxwell::VertexAttribute::Size::Size_16_16:+ return VK_FORMAT_R16G16_SINT;+ case Maxwell::VertexAttribute::Size::Size_16_16_16:+ return VK_FORMAT_R16G16B16_SINT;+ case Maxwell::VertexAttribute::Size::Size_16_16_16_16:+ return VK_FORMAT_R16G16B16A16_SINT;+ case Maxwell::VertexAttribute::Size::Size_32:+ return VK_FORMAT_R32_SINT;+ case Maxwell::VertexAttribute::Size::Size_32_32:+ return VK_FORMAT_R32G32_SINT;+ case Maxwell::VertexAttribute::Size::Size_32_32_32:+ return VK_FORMAT_R32G32B32_SINT;+ case Maxwell::VertexAttribute::Size::Size_32_32_32_32:+ return VK_FORMAT_R32G32B32A32_SINT;+ case Maxwell::VertexAttribute::Size::Size_10_10_10_2:+ return VK_FORMAT_A2B10G10R10_SINT_PACK32;+ default:+ break;+ }break;- }- break;- case Maxwell::VertexAttribute::Type::Float:- switch (size) {- case Maxwell::VertexAttribute::Size::Size_16:- return VK_FORMAT_R16_SFLOAT;- case Maxwell::VertexAttribute::Size::Size_16_16:- return VK_FORMAT_R16G16_SFLOAT;- case Maxwell::VertexAttribute::Size::Size_16_16_16:- return VK_FORMAT_R16G16B16_SFLOAT;- case Maxwell::VertexAttribute::Size::Size_16_16_16_16:- return VK_FORMAT_R16G16B16A16_SFLOAT;- case Maxwell::VertexAttribute::Size::Size_32:- return VK_FORMAT_R32_SFLOAT;- case Maxwell::VertexAttribute::Size::Size_32_32:- return VK_FORMAT_R32G32_SFLOAT;- case Maxwell::VertexAttribute::Size::Size_32_32_32:- return VK_FORMAT_R32G32B32_SFLOAT;- case Maxwell::VertexAttribute::Size::Size_32_32_32_32:- return VK_FORMAT_R32G32B32A32_SFLOAT;- case Maxwell::VertexAttribute::Size::Size_11_11_10:- return VK_FORMAT_B10G11R11_UFLOAT_PACK32;- default:+ case Maxwell::VertexAttribute::Type::Float:+ switch (size) {+ case Maxwell::VertexAttribute::Size::Size_16:+ return VK_FORMAT_R16_SFLOAT;+ case Maxwell::VertexAttribute::Size::Size_16_16:+ return VK_FORMAT_R16G16_SFLOAT;+ case Maxwell::VertexAttribute::Size::Size_16_16_16:+ return VK_FORMAT_R16G16B16_SFLOAT;+ case Maxwell::VertexAttribute::Size::Size_16_16_16_16:+ return VK_FORMAT_R16G16B16A16_SFLOAT;+ case Maxwell::VertexAttribute::Size::Size_32:+ return VK_FORMAT_R32_SFLOAT;+ case Maxwell::VertexAttribute::Size::Size_32_32:+ return VK_FORMAT_R32G32_SFLOAT;+ case Maxwell::VertexAttribute::Size::Size_32_32_32:+ return VK_FORMAT_R32G32B32_SFLOAT;+ case Maxwell::VertexAttribute::Size::Size_32_32_32_32:+ return VK_FORMAT_R32G32B32A32_SFLOAT;+ case Maxwell::VertexAttribute::Size::Size_11_11_10:+ return VK_FORMAT_B10G11R11_UFLOAT_PACK32;+ default:+ break;+ }break;}- break;+ return VK_FORMAT_UNDEFINED;+ })()};++ if (format == VK_FORMAT_UNDEFINED) {+ UNIMPLEMENTED_MSG("Unimplemented vertex format of type={} and size={}", type, size);}- UNIMPLEMENTED_MSG("Unimplemented vertex format of type={} and size={}", type, size);- return {};++ return device.GetSupportedFormat(format, VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT,+ FormatType::Buffer);}VkCompareOp ComparisonOp(Maxwell::ComparisonOp comparison) {diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.h b/src/video_core/renderer_vulkan/maxwell_to_vk.hindex 9edd6af6a6..356d46292b 100644--- a/src/video_core/renderer_vulkan/maxwell_to_vk.h+++ b/src/video_core/renderer_vulkan/maxwell_to_vk.h@@ -48,7 +48,8 @@ VkShaderStageFlagBits ShaderStage(Shader::Stage stage);VkPrimitiveTopology PrimitiveTopology(const Device& device, Maxwell::PrimitiveTopology topology);-VkFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttribute::Size size);+VkFormat VertexFormat(const Device& device, Maxwell::VertexAttribute::Type type,+ Maxwell::VertexAttribute::Size size);VkCompareOp ComparisonOp(Maxwell::ComparisonOp comparison);diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cppindex 682f053351..5aca8f0385 100644--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp@@ -559,7 +559,7 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {vertex_attributes.push_back({.location = static_cast<u32>(index),.binding = attribute.buffer,- .format = MaxwellToVK::VertexFormat(attribute.Type(), attribute.Size()),+ .format = MaxwellToVK::VertexFormat(device, attribute.Type(), attribute.Size()),.offset = attribute.offset,});}diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cppindex 10f9fe7fe6..16e46d3e51 100644--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp@@ -939,7 +939,7 @@ void RasterizerVulkan::UpdateVertexInput(Tegra::Engines::Maxwell3D::Regs& regs).pNext = nullptr,.location = static_cast<u32>(index),.binding = binding,- .format = MaxwellToVK::VertexFormat(attribute.type, attribute.size),+ .format = MaxwellToVK::VertexFormat(device, attribute.type, attribute.size),.offset = attribute.offset,});}diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cppindex 743ac09f6e..ddecfca132 100644--- a/src/video_core/vulkan_common/vulkan_device.cpp+++ b/src/video_core/vulkan_common/vulkan_device.cpp@@ -50,6 +50,21 @@ constexpr std::array R4G4_UNORM_PACK8{VK_FORMAT_UNDEFINED,};+constexpr std::array R16G16B16_SFLOAT{+ VK_FORMAT_R16G16B16A16_SFLOAT,+ VK_FORMAT_UNDEFINED,+};++constexpr std::array R16G16B16_SSCALED{+ VK_FORMAT_R16G16B16A16_SSCALED,+ VK_FORMAT_UNDEFINED,+};++constexpr std::array R8G8B8_SSCALED{+ VK_FORMAT_R8G8B8A8_SSCALED,+ VK_FORMAT_UNDEFINED,+};+} // namespace Alternativesenum class NvidiaArchitecture {@@ -102,6 +117,12 @@ constexpr const VkFormat* GetFormatAlternatives(VkFormat format) {return Alternatives::B5G6R5_UNORM_PACK16.data();case VK_FORMAT_R4G4_UNORM_PACK8:return Alternatives::R4G4_UNORM_PACK8.data();+ case VK_FORMAT_R16G16B16_SFLOAT:+ return Alternatives::R16G16B16_SFLOAT.data();+ case VK_FORMAT_R16G16B16_SSCALED:+ return Alternatives::R16G16B16_SSCALED.data();+ case VK_FORMAT_R8G8B8_SSCALED:+ return Alternatives::R8G8B8_SSCALED.data();default:return nullptr;}@@ -122,109 +143,142 @@ VkFormatFeatureFlags GetFormatFeatures(VkFormatProperties properties, FormatTypestd::unordered_map<VkFormat, VkFormatProperties> GetFormatProperties(vk::PhysicalDevice physical) {static constexpr std::array formats{- VK_FORMAT_A8B8G8R8_UNORM_PACK32,- VK_FORMAT_A8B8G8R8_UINT_PACK32,- VK_FORMAT_A8B8G8R8_SNORM_PACK32,+ VK_FORMAT_A1R5G5B5_UNORM_PACK16,+ VK_FORMAT_A2B10G10R10_SINT_PACK32,+ VK_FORMAT_A2B10G10R10_SNORM_PACK32,+ VK_FORMAT_A2B10G10R10_SSCALED_PACK32,+ VK_FORMAT_A2B10G10R10_UINT_PACK32,+ VK_FORMAT_A2B10G10R10_UNORM_PACK32,+ VK_FORMAT_A2B10G10R10_USCALED_PACK32,VK_FORMAT_A8B8G8R8_SINT_PACK32,+ VK_FORMAT_A8B8G8R8_SNORM_PACK32,VK_FORMAT_A8B8G8R8_SRGB_PACK32,- VK_FORMAT_R5G6B5_UNORM_PACK16,- VK_FORMAT_B5G6R5_UNORM_PACK16,- VK_FORMAT_R5G5B5A1_UNORM_PACK16,+ VK_FORMAT_A8B8G8R8_UINT_PACK32,+ VK_FORMAT_A8B8G8R8_UNORM_PACK32,+ VK_FORMAT_ASTC_10x10_SRGB_BLOCK,+ VK_FORMAT_ASTC_10x10_UNORM_BLOCK,+ VK_FORMAT_ASTC_10x5_SRGB_BLOCK,+ VK_FORMAT_ASTC_10x5_UNORM_BLOCK,+ VK_FORMAT_ASTC_10x6_SRGB_BLOCK,+ VK_FORMAT_ASTC_10x6_UNORM_BLOCK,+ VK_FORMAT_ASTC_10x8_SRGB_BLOCK,+ VK_FORMAT_ASTC_10x8_UNORM_BLOCK,+ VK_FORMAT_ASTC_12x10_SRGB_BLOCK,+ VK_FORMAT_ASTC_12x10_UNORM_BLOCK,+ VK_FORMAT_ASTC_12x12_SRGB_BLOCK,+ VK_FORMAT_ASTC_12x12_UNORM_BLOCK,+ VK_FORMAT_ASTC_4x4_SRGB_BLOCK,+ VK_FORMAT_ASTC_4x4_UNORM_BLOCK,+ VK_FORMAT_ASTC_5x4_SRGB_BLOCK,+ VK_FORMAT_ASTC_5x4_UNORM_BLOCK,+ VK_FORMAT_ASTC_5x5_SRGB_BLOCK,+ VK_FORMAT_ASTC_5x5_UNORM_BLOCK,+ VK_FORMAT_ASTC_6x5_SRGB_BLOCK,+ VK_FORMAT_ASTC_6x5_UNORM_BLOCK,+ VK_FORMAT_ASTC_6x6_SRGB_BLOCK,+ VK_FORMAT_ASTC_6x6_UNORM_BLOCK,+ VK_FORMAT_ASTC_8x5_SRGB_BLOCK,+ VK_FORMAT_ASTC_8x5_UNORM_BLOCK,+ VK_FORMAT_ASTC_8x6_SRGB_BLOCK,+ VK_FORMAT_ASTC_8x6_UNORM_BLOCK,+ VK_FORMAT_ASTC_8x8_SRGB_BLOCK,+ VK_FORMAT_ASTC_8x8_UNORM_BLOCK,+ VK_FORMAT_B10G11R11_UFLOAT_PACK32,+ VK_FORMAT_B4G4R4A4_UNORM_PACK16,VK_FORMAT_B5G5R5A1_UNORM_PACK16,- VK_FORMAT_A2B10G10R10_UNORM_PACK32,- VK_FORMAT_A2B10G10R10_UINT_PACK32,- VK_FORMAT_A1R5G5B5_UNORM_PACK16,- VK_FORMAT_R32G32B32A32_SFLOAT,- VK_FORMAT_R32G32B32A32_SINT,- VK_FORMAT_R32G32B32A32_UINT,- VK_FORMAT_R32G32_SFLOAT,- VK_FORMAT_R32G32_SINT,- VK_FORMAT_R32G32_UINT,+ VK_FORMAT_B5G6R5_UNORM_PACK16,+ VK_FORMAT_B8G8R8A8_SRGB,+ VK_FORMAT_B8G8R8A8_UNORM,+ VK_FORMAT_BC1_RGBA_SRGB_BLOCK,+ VK_FORMAT_BC1_RGBA_UNORM_BLOCK,+ VK_FORMAT_BC2_SRGB_BLOCK,+ VK_FORMAT_BC2_UNORM_BLOCK,+ VK_FORMAT_BC3_SRGB_BLOCK,+ VK_FORMAT_BC3_UNORM_BLOCK,+ VK_FORMAT_BC4_SNORM_BLOCK,+ VK_FORMAT_BC4_UNORM_BLOCK,+ VK_FORMAT_BC5_SNORM_BLOCK,+ VK_FORMAT_BC5_UNORM_BLOCK,+ VK_FORMAT_BC6H_SFLOAT_BLOCK,+ VK_FORMAT_BC6H_UFLOAT_BLOCK,+ VK_FORMAT_BC7_SRGB_BLOCK,+ VK_FORMAT_BC7_UNORM_BLOCK,+ VK_FORMAT_D16_UNORM,+ VK_FORMAT_D16_UNORM_S8_UINT,+ VK_FORMAT_D24_UNORM_S8_UINT,+ VK_FORMAT_D32_SFLOAT,+ VK_FORMAT_D32_SFLOAT_S8_UINT,+ VK_FORMAT_E5B9G9R9_UFLOAT_PACK32,+ VK_FORMAT_R16G16B16A16_SFLOAT,VK_FORMAT_R16G16B16A16_SINT,- VK_FORMAT_R16G16B16A16_UINT,VK_FORMAT_R16G16B16A16_SNORM,+ VK_FORMAT_R16G16B16A16_SSCALED,+ VK_FORMAT_R16G16B16A16_UINT,VK_FORMAT_R16G16B16A16_UNORM,- VK_FORMAT_R16G16_UNORM,- VK_FORMAT_R16G16_SNORM,+ VK_FORMAT_R16G16B16A16_USCALED,+ VK_FORMAT_R16G16B16_SFLOAT,+ VK_FORMAT_R16G16B16_SINT,+ VK_FORMAT_R16G16B16_SNORM,+ VK_FORMAT_R16G16B16_SSCALED,+ VK_FORMAT_R16G16B16_UINT,+ VK_FORMAT_R16G16B16_UNORM,+ VK_FORMAT_R16G16B16_USCALED,VK_FORMAT_R16G16_SFLOAT,- VK_FORMAT_R16G16_UINT,VK_FORMAT_R16G16_SINT,- VK_FORMAT_R16_UNORM,+ VK_FORMAT_R16G16_SNORM,+ VK_FORMAT_R16G16_SSCALED,+ VK_FORMAT_R16G16_UINT,+ VK_FORMAT_R16G16_UNORM,+ VK_FORMAT_R16G16_USCALED,+ VK_FORMAT_R16_SFLOAT,+ VK_FORMAT_R16_SINT,VK_FORMAT_R16_SNORM,+ VK_FORMAT_R16_SSCALED,VK_FORMAT_R16_UINT,+ VK_FORMAT_R16_UNORM,+ VK_FORMAT_R16_USCALED,+ VK_FORMAT_R32G32B32A32_SFLOAT,+ VK_FORMAT_R32G32B32A32_SINT,+ VK_FORMAT_R32G32B32A32_UINT,+ VK_FORMAT_R32G32B32_SFLOAT,+ VK_FORMAT_R32G32B32_SINT,+ VK_FORMAT_R32G32B32_UINT,+ VK_FORMAT_R32G32_SFLOAT,+ VK_FORMAT_R32G32_SINT,+ VK_FORMAT_R32G32_UINT,+ VK_FORMAT_R32_SFLOAT,+ VK_FORMAT_R32_SINT,+ VK_FORMAT_R32_UINT,+ VK_FORMAT_R4G4B4A4_UNORM_PACK16,+ VK_FORMAT_R4G4_UNORM_PACK8,+ VK_FORMAT_R5G5B5A1_UNORM_PACK16,+ VK_FORMAT_R5G6B5_UNORM_PACK16,+ VK_FORMAT_R8G8B8A8_SINT,+ VK_FORMAT_R8G8B8A8_SNORM,VK_FORMAT_R8G8B8A8_SRGB,- VK_FORMAT_R8G8_UNORM,- VK_FORMAT_R8G8_SNORM,+ VK_FORMAT_R8G8B8A8_SSCALED,+ VK_FORMAT_R8G8B8A8_UINT,+ VK_FORMAT_R8G8B8A8_UNORM,+ VK_FORMAT_R8G8B8A8_USCALED,+ VK_FORMAT_R8G8B8_SINT,+ VK_FORMAT_R8G8B8_SNORM,+ VK_FORMAT_R8G8B8_SSCALED,+ VK_FORMAT_R8G8B8_UINT,+ VK_FORMAT_R8G8B8_UNORM,+ VK_FORMAT_R8G8B8_USCALED,VK_FORMAT_R8G8_SINT,+ VK_FORMAT_R8G8_SNORM,+ VK_FORMAT_R8G8_SSCALED,VK_FORMAT_R8G8_UINT,- VK_FORMAT_R8_UNORM,- VK_FORMAT_R8_SNORM,+ VK_FORMAT_R8G8_UNORM,+ VK_FORMAT_R8G8_USCALED,VK_FORMAT_R8_SINT,+ VK_FORMAT_R8_SNORM,+ VK_FORMAT_R8_SSCALED,VK_FORMAT_R8_UINT,- VK_FORMAT_B10G11R11_UFLOAT_PACK32,- VK_FORMAT_R32_SFLOAT,- VK_FORMAT_R32_UINT,- VK_FORMAT_R32_SINT,- VK_FORMAT_R16_SFLOAT,- VK_FORMAT_R16G16B16A16_SFLOAT,- VK_FORMAT_B8G8R8A8_UNORM,- VK_FORMAT_B8G8R8A8_SRGB,- VK_FORMAT_R4G4_UNORM_PACK8,- VK_FORMAT_R4G4B4A4_UNORM_PACK16,- VK_FORMAT_B4G4R4A4_UNORM_PACK16,- VK_FORMAT_D32_SFLOAT,- VK_FORMAT_D16_UNORM,+ VK_FORMAT_R8_UNORM,+ VK_FORMAT_R8_USCALED,VK_FORMAT_S8_UINT,- VK_FORMAT_D16_UNORM_S8_UINT,- VK_FORMAT_D24_UNORM_S8_UINT,- VK_FORMAT_D32_SFLOAT_S8_UINT,- VK_FORMAT_BC1_RGBA_UNORM_BLOCK,- VK_FORMAT_BC2_UNORM_BLOCK,- VK_FORMAT_BC3_UNORM_BLOCK,- VK_FORMAT_BC4_UNORM_BLOCK,- VK_FORMAT_BC4_SNORM_BLOCK,- VK_FORMAT_BC5_UNORM_BLOCK,- VK_FORMAT_BC5_SNORM_BLOCK,- VK_FORMAT_BC7_UNORM_BLOCK,- VK_FORMAT_BC6H_UFLOAT_BLOCK,- VK_FORMAT_BC6H_SFLOAT_BLOCK,- VK_FORMAT_BC1_RGBA_SRGB_BLOCK,- VK_FORMAT_BC2_SRGB_BLOCK,- VK_FORMAT_BC3_SRGB_BLOCK,- VK_FORMAT_BC7_SRGB_BLOCK,- VK_FORMAT_ASTC_4x4_UNORM_BLOCK,- VK_FORMAT_ASTC_4x4_SRGB_BLOCK,- VK_FORMAT_ASTC_5x4_UNORM_BLOCK,- VK_FORMAT_ASTC_5x4_SRGB_BLOCK,- VK_FORMAT_ASTC_5x5_UNORM_BLOCK,- VK_FORMAT_ASTC_5x5_SRGB_BLOCK,- VK_FORMAT_ASTC_6x5_UNORM_BLOCK,- VK_FORMAT_ASTC_6x5_SRGB_BLOCK,- VK_FORMAT_ASTC_6x6_UNORM_BLOCK,- VK_FORMAT_ASTC_6x6_SRGB_BLOCK,- VK_FORMAT_ASTC_8x5_UNORM_BLOCK,- VK_FORMAT_ASTC_8x5_SRGB_BLOCK,- VK_FORMAT_ASTC_8x6_UNORM_BLOCK,- VK_FORMAT_ASTC_8x6_SRGB_BLOCK,- VK_FORMAT_ASTC_8x8_UNORM_BLOCK,- VK_FORMAT_ASTC_8x8_SRGB_BLOCK,- VK_FORMAT_ASTC_10x5_UNORM_BLOCK,- VK_FORMAT_ASTC_10x5_SRGB_BLOCK,- VK_FORMAT_ASTC_10x6_UNORM_BLOCK,- VK_FORMAT_ASTC_10x6_SRGB_BLOCK,- VK_FORMAT_ASTC_10x8_UNORM_BLOCK,- VK_FORMAT_ASTC_10x8_SRGB_BLOCK,- VK_FORMAT_ASTC_10x10_UNORM_BLOCK,- VK_FORMAT_ASTC_10x10_SRGB_BLOCK,- VK_FORMAT_ASTC_12x10_UNORM_BLOCK,- VK_FORMAT_ASTC_12x10_SRGB_BLOCK,- VK_FORMAT_ASTC_12x12_UNORM_BLOCK,- VK_FORMAT_ASTC_12x12_SRGB_BLOCK,- VK_FORMAT_ASTC_8x6_UNORM_BLOCK,- VK_FORMAT_ASTC_8x6_SRGB_BLOCK,- VK_FORMAT_ASTC_6x5_UNORM_BLOCK,- VK_FORMAT_ASTC_6x5_SRGB_BLOCK,- VK_FORMAT_E5B9G9R9_UFLOAT_PACK32,};std::unordered_map<VkFormat, VkFormatProperties> format_properties;for (const auto format : formats) {@@ -739,9 +793,9 @@ VkFormat Device::GetSupportedFormat(VkFormat wanted_format, VkFormatFeatureFlagsif (!IsFormatSupported(alternative, wanted_usage, format_type)) {continue;}- LOG_WARNING(Render_Vulkan,- "Emulating format={} with alternative format={} with usage={} and type={}",- wanted_format, alternative, wanted_usage, format_type);+ LOG_DEBUG(Render_Vulkan,+ "Emulating format={} with alternative format={} with usage={} and type={}",+ wanted_format, alternative, wanted_usage, format_type);return alternative;}