mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-27 12:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a cleaner error check

Browse Source
This commit is contained in:
kalaposfos13 2025-04-20 19:15:12 +02:00
parent 7fa2d0ea42
commit 1f1f8d1037
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video_core/renderer_vulkan/liverpool_to_vk.h
View File

@ -100,14 +100,13 @@ static inline bool IsFormatStencilCompatible(vk::Format fmt) {
} }
} }
static inline vk::Format PromoteFormatToDepth(vk::Format fmt, bool& valid) { static inline vk::Format PromoteFormatToDepth(vk::Format fmt) {
if (fmt == vk::Format::eR32Sfloat || fmt == vk::Format::eR32Uint) { if (fmt == vk::Format::eR32Sfloat || fmt == vk::Format::eR32Uint) {
return vk::Format::eD32Sfloat; return vk::Format::eD32Sfloat;
} else if (fmt == vk::Format::eR16Unorm) { } else if (fmt == vk::Format::eR16Unorm) {
return vk::Format::eD16Unorm; return vk::Format::eD16Unorm;
} }
valid = false; return vk::Format::eUndefined;
return fmt; // move the unreachable one step up to be able to print more info
} }
} // namespace Vulkan::LiverpoolToVK } // namespace Vulkan::LiverpoolToVK

5
src/video_core/texture_cache/image_info.cpp
View File

@ -128,10 +128,9 @@ ImageInfo::ImageInfo(const AmdGpu::Image& image, const Shader::ImageResource& de
pixel_format = LiverpoolToVK::SurfaceFormat(image.GetDataFmt(), image.GetNumberFmt()); pixel_format = LiverpoolToVK::SurfaceFormat(image.GetDataFmt(), image.GetNumberFmt());
// Override format if image is forced to be a depth target, except if the image is a dummy one // Override format if image is forced to be a depth target, except if the image is a dummy one
if (desc.is_depth && (image.width != 0 && image.height != 0)) { if (desc.is_depth && (image.width != 0 && image.height != 0)) {
bool valid = true; pixel_format = Vulkan::LiverpoolToVK::PromoteFormatToDepth(pixel_format);
pixel_format = Vulkan::LiverpoolToVK::PromoteFormatToDepth(pixel_format, valid);
ASSERT_MSG( ASSERT_MSG(
valid, pixel_format != vk::Format::eUndefined,
"PromoteFormatToDepth failed, info dump: format: {}, size: {}x{}, data_format: {}", "PromoteFormatToDepth failed, info dump: format: {}, size: {}x{}, data_format: {}",
vk::to_string(pixel_format), image.width + 1, image.height + 1, vk::to_string(pixel_format), image.width + 1, image.height + 1,
AmdGpu::NameOf(image.GetDataFmt())); AmdGpu::NameOf(image.GetDataFmt()));

5
src/video_core/texture_cache/image_view.cpp
View File

@ -39,10 +39,9 @@ ImageViewInfo::ImageViewInfo(const AmdGpu::Image& image, const Shader::ImageReso
format = Vulkan::LiverpoolToVK::SurfaceFormat(dfmt, nfmt); format = Vulkan::LiverpoolToVK::SurfaceFormat(dfmt, nfmt);
// Override format if image is forced to be a depth target, except if the image is a dummy one // Override format if image is forced to be a depth target, except if the image is a dummy one
if (desc.is_depth && (image.width != 0 && image.height != 0)) { if (desc.is_depth && (image.width != 0 && image.height != 0)) {
bool valid = true; format = Vulkan::LiverpoolToVK::PromoteFormatToDepth(format);
format = Vulkan::LiverpoolToVK::PromoteFormatToDepth(format, valid);
ASSERT_MSG( ASSERT_MSG(
valid, format != vk::Format::eUndefined,
"PromoteFormatToDepth failed, info dump: format: {}, size: {}x{}, data_format: {}", "PromoteFormatToDepth failed, info dump: format: {}, size: {}x{}, data_format: {}",
vk::to_string(format), image.width, image.height, AmdGpu::NameOf(image.GetDataFmt())); vk::to_string(format), image.width, image.height, AmdGpu::NameOf(image.GetDataFmt()));
} }