Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Readback Vulkan fixes #1430

Merged
merged 4 commits into from
Jan 12, 2025
Merged

Readback Vulkan fixes #1430

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
952fd0d
Add missing readbacks
rcaridade145 Nov 18, 2024
31c6ddd
Merge branch 'cemu-project:main' into readback-vk-fixes
rcaridade145 Nov 24, 2024
90480ed
Update src/Cafe/HW/Latte/Renderer/Vulkan/TextureReadbackVk.cpp
rcaridade145 Nov 26, 2024
c8cc31e
Addressing comments in review
rcaridade145 Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/Cafe/HW/Latte/Renderer/Vulkan/TextureReadbackVk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ uint32 LatteTextureReadbackInfoVk::GetImageSize(LatteTextureView* textureView)
cemu_assert(textureFormat == VK_FORMAT_R8G8B8A8_UNORM);
return baseTexture->width * baseTexture->height * 4;
}
else if (textureView->format == Latte::E_GX2SURFFMT::R8_UNORM)
else if (textureView->format == Latte::E_GX2SURFFMT::R8_UNORM )
{
cemu_assert(textureFormat == VK_FORMAT_R8_UNORM);
return baseTexture->width * baseTexture->height * 1;
Expand Down Expand Up @@ -79,6 +79,16 @@ uint32 LatteTextureReadbackInfoVk::GetImageSize(LatteTextureView* textureView)
// todo - if driver does not support VK_FORMAT_D24_UNORM_S8_UINT this is represented as VK_FORMAT_D32_SFLOAT_S8_UINT which is 8 bytes
return baseTexture->width * baseTexture->height * 4;
}
else if (textureView->format == Latte::E_GX2SURFFMT::R5_G6_B5_UNORM )
{
cemu_assert(textureFormat == VK_FORMAT_R8G8B8A8_UNORM);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latte::E_GX2SURFFMT::R5_G6_B5_UNORM is a bit tricky, because it can be emulated as either VK_FORMAT_R5G6B5_UNORM_PACK16 or if that is not supported by the driver the Vulkan backend will fallback to VK_FORMAT_R8G8B8A8_UNORM. See the code here. The readback code needs to handle this correctly. For non-matching formats conversion is necessary. If you want to keep it simple you could ignore the more complicated case and return 0 when textureFormat != VK_FORMAT_R5G6B5_UNORM_PACK16

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hopefully things are ok now.

return baseTexture->width * baseTexture->height * 4;
rcaridade145 marked this conversation as resolved.
Show resolved Hide resolved
}
else if (textureView->format == Latte::E_GX2SURFFMT::R5_G5_B5_A1_UNORM )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For R5_G5_B5_A1_UNORM conversion is always necessary since the backend doesn't use Vulkan formats that are bit-compatible. See code here. Maybe just drop this case for now?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

{
cemu_assert(textureFormat == VK_FORMAT_R8G8B8A8_UNORM);
return baseTexture->width * baseTexture->height * 4;
}
else
{
cemuLog_log(LogType::Force, "Unsupported texture readback format {:04x}", (uint32)textureView->format);
Expand Down