Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-06-08 11:43:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

video_core: added support for alternate CB channels order

Browse source
This commit is contained in:
psucien 2024-06-15 22:18:21 +02:00
parent b9602afc82
commit b2b45bf480
7 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/video_core/renderer_vulkan/liverpool_to_vk.cpp
View file

@ -276,7 +276,13 @@ vk::BorderColor BorderColor(AmdGpu::BorderColor color) {
}
}
vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat num_format) {
vk::Format SurfaceFormat(
AmdGpu::DataFormat data_format, AmdGpu::NumberFormat num_format,
Liverpool::ColorBuffer::SwapMode comp_swap /*= Liverpool::ColorBuffer::SwapMode::Standard*/) {
ASSERT_MSG(comp_swap == Liverpool::ColorBuffer::SwapMode::Standard ||
comp_swap == Liverpool::ColorBuffer::SwapMode::Alternate,
"Unsupported component swap mode {}", static_cast<u32>(comp_swap));
if (data_format == AmdGpu::DataFormat::Format32_32_32_32 &&
num_format == AmdGpu::NumberFormat::Float) {
return vk::Format::eR32G32B32A32Sfloat;
@ -287,11 +293,14 @@ vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat nu
}
if (data_format == AmdGpu::DataFormat::Format8_8_8_8 &&
num_format == AmdGpu::NumberFormat::Unorm) {
return vk::Format::eR8G8B8A8Unorm;
return comp_swap == Liverpool::ColorBuffer::SwapMode::Alternate
? vk::Format::eB8G8R8A8Unorm
: vk::Format::eR8G8B8A8Unorm;
}
if (data_format == AmdGpu::DataFormat::Format8_8_8_8 &&
num_format == AmdGpu::NumberFormat::Srgb) {
return vk::Format::eB8G8R8A8Srgb;
return comp_swap == Liverpool::ColorBuffer::SwapMode::Alternate ? vk::Format::eB8G8R8A8Srgb
: vk::Format::eR8G8B8A8Srgb;
}
if (data_format == AmdGpu::DataFormat::Format32_32_32 &&
num_format == AmdGpu::NumberFormat::Float) {

4
src/video_core/renderer_vulkan/liverpool_to_vk.h
View file

@ -38,7 +38,9 @@ vk::SamplerMipmapMode MipFilter(AmdGpu::MipFilter filter);
vk::BorderColor BorderColor(AmdGpu::BorderColor color);
vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat num_format);
vk::Format SurfaceFormat(
AmdGpu::DataFormat data_format, AmdGpu::NumberFormat num_format,
Liverpool::ColorBuffer::SwapMode comp_swap = Liverpool::ColorBuffer::SwapMode::Standard);
vk::Format DepthFormat(Liverpool::DepthBuffer::ZFormat z_format,
Liverpool::DepthBuffer::StencilFormat stencil_format);

4
src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
View file

@ -129,8 +129,8 @@ void PipelineCache::RefreshGraphicsKey() {
if (!col_buf) {
continue;
}
key.color_formats[remapped_cb] =
LiverpoolToVK::SurfaceFormat(col_buf.info.format, col_buf.NumFormat());
key.color_formats[remapped_cb] = LiverpoolToVK::SurfaceFormat(
col_buf.info.format, col_buf.NumFormat(), col_buf.info.comp_swap.Value());
key.blend_controls[remapped_cb] = regs.blend_control[cb];
key.blend_controls[remapped_cb].enable.Assign(key.blend_controls[remapped_cb].enable &&
!col_buf.info.blend_bypass);