catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge e8d1fec600 into 4182740384

This commit is contained in:
Grégoire Hage 2024-08-31 00:19:36 +02:00 committed by GitHub
parent 4182740384 e8d1fec600
commit dd928a6706
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -581,10 +581,13 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
vk::Format AdjustColorBufferFormat(vk::Format base_format, vk::Format AdjustColorBufferFormat(vk::Format base_format,
Liverpool::ColorBuffer::SwapMode comp_swap, bool is_vo_surface) { Liverpool::ColorBuffer::SwapMode comp_swap, bool is_vo_surface) {
ASSERT_MSG(comp_swap == Liverpool::ColorBuffer::SwapMode::Standard || ASSERT_MSG(comp_swap == Liverpool::ColorBuffer::SwapMode::Standard ||
comp_swap == Liverpool::ColorBuffer::SwapMode::Alternate, comp_swap == Liverpool::ColorBuffer::SwapMode::Alternate ||
comp_swap == Liverpool::ColorBuffer::SwapMode::StandardReverse,
"Unsupported component swap mode {}", static_cast<u32>(comp_swap)); "Unsupported component swap mode {}", static_cast<u32>(comp_swap));
const bool comp_swap_alt = comp_swap == Liverpool::ColorBuffer::SwapMode::Alternate; const bool comp_swap_alt = comp_swap == Liverpool::ColorBuffer::SwapMode::Alternate;
const bool comp_swap_reverse = comp_swap == Liverpool::ColorBuffer::SwapMode::StandardReverse;
if (comp_swap_alt) { if (comp_swap_alt) {
switch (base_format) { switch (base_format) {
case vk::Format::eR8G8B8A8Unorm: case vk::Format::eR8G8B8A8Unorm:
@ -598,6 +601,21 @@ vk::Format AdjustColorBufferFormat(vk::Format base_format,
default: default:
break; break;
} }
} else if (comp_swap_reverse) {
switch (base_format) {
case vk::Format::eR8G8B8A8Unorm:
return vk::Format::eA8B8G8R8UnormPack32;
case vk::Format::eB8G8R8A8Unorm:
return vk::Format::eA8B8G8R8UnormPack32;
case vk::Format::eR8G8B8A8Srgb:
return is_vo_surface ? vk::Format::eA8B8G8R8UnormPack32
: vk::Format::eA8B8G8R8SrgbPack32;
case vk::Format::eB8G8R8A8Srgb:
return is_vo_surface ? vk::Format::eA8B8G8R8UnormPack32
: vk::Format::eA8B8G8R8SrgbPack32;
default:
break;
}
} else { } else {
if (is_vo_surface && base_format == vk::Format::eR8G8B8A8Srgb) { if (is_vo_surface && base_format == vk::Format::eR8G8B8A8Srgb) {
return vk::Format::eR8G8B8A8Unorm; return vk::Format::eR8G8B8A8Unorm;