mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 00:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

video_core: Add some missing formats in Surface Formats

Browse Source 
They *might* appear but also might not. Adding them for the future
This commit is contained in:
korenkonder 2024-09-19 21:47:20 +03:00
parent 89853946b0
commit 7cd56a57b9
1 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/video_core/renderer_vulkan/liverpool_to_vk.cpp
View File

@ -374,6 +374,10 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
return vk::Format::eR8Unorm; return vk::Format::eR8Unorm;
case AmdGpu::NumberFormat::Snorm: case AmdGpu::NumberFormat::Snorm:
return vk::Format::eR8Snorm; return vk::Format::eR8Snorm;
case AmdGpu::NumberFormat::Uscaled:
return vk::Format::eR8Uscaled;
case AmdGpu::NumberFormat::Sscaled:
return vk::Format::eR8Sscaled;
case AmdGpu::NumberFormat::Uint: case AmdGpu::NumberFormat::Uint:
return vk::Format::eR8Uint; return vk::Format::eR8Uint;
case AmdGpu::NumberFormat::Sint: case AmdGpu::NumberFormat::Sint:
@ -388,8 +392,16 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
switch (num_format) { switch (num_format) {
case AmdGpu::NumberFormat::Unorm: case AmdGpu::NumberFormat::Unorm:
return vk::Format::eR16Unorm; return vk::Format::eR16Unorm;
case AmdGpu::NumberFormat::Snorm:
return vk::Format::eR16Snorm;
case AmdGpu::NumberFormat::Uscaled:
return vk::Format::eR16Uscaled;
case AmdGpu::NumberFormat::Sscaled:
return vk::Format::eR16Sscaled;
case AmdGpu::NumberFormat::Uint: case AmdGpu::NumberFormat::Uint:
return vk::Format::eR16Uint; return vk::Format::eR16Uint;
case AmdGpu::NumberFormat::Sint:
return vk::Format::eR16Sint;
case AmdGpu::NumberFormat::Float: case AmdGpu::NumberFormat::Float:
return vk::Format::eR16Sfloat; return vk::Format::eR16Sfloat;
default: default:
@ -402,8 +414,16 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
return vk::Format::eR8G8Unorm; return vk::Format::eR8G8Unorm;
case AmdGpu::NumberFormat::Snorm: case AmdGpu::NumberFormat::Snorm:
return vk::Format::eR8G8Snorm; return vk::Format::eR8G8Snorm;
case AmdGpu::NumberFormat::Uscaled:
return vk::Format::eR8G8Uscaled;
case AmdGpu::NumberFormat::Sscaled:
return vk::Format::eR8G8Sscaled;
case AmdGpu::NumberFormat::Uint: case AmdGpu::NumberFormat::Uint:
return vk::Format::eR8G8Uint; return vk::Format::eR8G8Uint;
case AmdGpu::NumberFormat::Sint:
return vk::Format::eR8G8Sint;
case AmdGpu::NumberFormat::Srgb:
return vk::Format::eR8G8Srgb;
default: default:
break; break;
} }
@ -426,6 +446,8 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
return vk::Format::eR16G16Unorm; return vk::Format::eR16G16Unorm;
case AmdGpu::NumberFormat::Snorm: case AmdGpu::NumberFormat::Snorm:
return vk::Format::eR16G16Snorm; return vk::Format::eR16G16Snorm;
case AmdGpu::NumberFormat::Uscaled:
return vk::Format::eR16G16Uscaled;
case AmdGpu::NumberFormat::Sscaled: case AmdGpu::NumberFormat::Sscaled:
return vk::Format::eR16G16Sscaled; return vk::Format::eR16G16Sscaled;
case AmdGpu::NumberFormat::Uint: case AmdGpu::NumberFormat::Uint:
@ -462,6 +484,14 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
return vk::Format::eA2B10G10R10UnormPack32; return vk::Format::eA2B10G10R10UnormPack32;
case AmdGpu::NumberFormat::Snorm: case AmdGpu::NumberFormat::Snorm:
return vk::Format::eA2B10G10R10SnormPack32; return vk::Format::eA2B10G10R10SnormPack32;
case AmdGpu::NumberFormat::Uscaled:
return vk::Format::eA2B10G10R10UscaledPack32;
case AmdGpu::NumberFormat::Sscaled:
return vk::Format::eA2B10G10R10SscaledPack32;
case AmdGpu::NumberFormat::Uint:
return vk::Format::eA2B10G10R10UintPack32;
case AmdGpu::NumberFormat::Sint:
return vk::Format::eA2B10G10R10SintPack32;
default: default:
break; break;
} }
@ -474,6 +504,8 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
return vk::Format::eR8G8B8A8Snorm; return vk::Format::eR8G8B8A8Snorm;
case AmdGpu::NumberFormat::Uscaled: case AmdGpu::NumberFormat::Uscaled:
return vk::Format::eR8G8B8A8Uscaled; return vk::Format::eR8G8B8A8Uscaled;
case AmdGpu::NumberFormat::Sscaled:
return vk::Format::eR8G8B8A8Sscaled;
case AmdGpu::NumberFormat::Uint: case AmdGpu::NumberFormat::Uint:
return vk::Format::eR8G8B8A8Uint; return vk::Format::eR8G8B8A8Uint;
case AmdGpu::NumberFormat::Sint: case AmdGpu::NumberFormat::Sint:
@ -488,6 +520,8 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
switch (num_format) { switch (num_format) {
case AmdGpu::NumberFormat::Uint: case AmdGpu::NumberFormat::Uint:
return vk::Format::eR32G32Uint; return vk::Format::eR32G32Uint;
case AmdGpu::NumberFormat::Sint:
return vk::Format::eR32G32Sint;
case AmdGpu::NumberFormat::Float: case AmdGpu::NumberFormat::Float:
return vk::Format::eR32G32Sfloat; return vk::Format::eR32G32Sfloat;
default: default:
@ -500,6 +534,8 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
return vk::Format::eR16G16B16A16Unorm; return vk::Format::eR16G16B16A16Unorm;
case AmdGpu::NumberFormat::Snorm: case AmdGpu::NumberFormat::Snorm:
return vk::Format::eR16G16B16A16Snorm; return vk::Format::eR16G16B16A16Snorm;
case AmdGpu::NumberFormat::Uscaled:
return vk::Format::eR16G16B16A16Uscaled;
case AmdGpu::NumberFormat::Sscaled: case AmdGpu::NumberFormat::Sscaled:
return vk::Format::eR16G16B16A16Sscaled; return vk::Format::eR16G16B16A16Sscaled;
case AmdGpu::NumberFormat::Uint: case AmdGpu::NumberFormat::Uint:
@ -518,6 +554,8 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
switch (num_format) { switch (num_format) {
case AmdGpu::NumberFormat::Uint: case AmdGpu::NumberFormat::Uint:
return vk::Format::eR32G32B32Uint; return vk::Format::eR32G32B32Uint;
case AmdGpu::NumberFormat::Sint:
return vk::Format::eR32G32B32Sint;
case AmdGpu::NumberFormat::Float: case AmdGpu::NumberFormat::Float:
return vk::Format::eR32G32B32Sfloat; return vk::Format::eR32G32B32Sfloat;
default: default:
@ -614,6 +652,8 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
switch (num_format) { switch (num_format) {
case AmdGpu::NumberFormat::Unorm: case AmdGpu::NumberFormat::Unorm:
return vk::Format::eBc4UnormBlock; return vk::Format::eBc4UnormBlock;
case AmdGpu::NumberFormat::Snorm:
return vk::Format::eBc4SnormBlock;
default: default:
break; break;
} }
@ -648,6 +688,8 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
break; break;
} }
break; break;
default:
break;
} }
UNREACHABLE_MSG("Unknown data_format={} and num_format={}", u32(data_format), u32(num_format)); UNREACHABLE_MSG("Unknown data_format={} and num_format={}", u32(data_format), u32(num_format));