Archive/shadPS4
0
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-04-28 13:28:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

texture_cache: Relax mismatched image type from assert to cache miss. (#2830)
Some checks are pending
Build and Release / windows-sdl (push) Blocked by required conditions
Details
Build and Release / windows-qt (push) Blocked by required conditions
Details
Build and Release / macos-sdl (push) Blocked by required conditions
Details
Build and Release / reuse (push) Waiting to run
Details
Build and Release / clang-format (push) Waiting to run
Details
Build and Release / get-info (push) Waiting to run
Details
Build and Release / macos-qt (push) Blocked by required conditions
Details
Build and Release / linux-sdl (push) Blocked by required conditions
Details
Build and Release / linux-qt (push) Blocked by required conditions
Details
Build and Release / linux-sdl-gcc (push) Blocked by required conditions
Details
Build and Release / linux-qt-gcc (push) Blocked by required conditions
Details
Build and Release / pre-release (push) Blocked by required conditions
Details

Browse source
This commit is contained in:
squidbus 2025-04-22 15:03:43 -07:00 • committed by GitHub
parent 5b0205bc59
commit 0297aee3f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/video_core/texture_cache/texture_cache.cpp
View file

@ -319,17 +319,14 @@ ImageId TextureCache::FindImage(BaseDesc& desc, FindFlags flags) {
continue; continue;
} }
if (False(flags & FindFlags::RelaxFmt) && if (False(flags & FindFlags::RelaxFmt) &&
!IsVulkanFormatCompatible(info.pixel_format, cache_image.info.pixel_format)) { (!IsVulkanFormatCompatible(info.pixel_format, cache_image.info.pixel_format) ||
(cache_image.info.type != info.type && info.size != Extent3D{1, 1, 1}))) {
continue; continue;
} }
if (True(flags & FindFlags::ExactFmt) && if (True(flags & FindFlags::ExactFmt) &&
info.pixel_format != cache_image.info.pixel_format) { info.pixel_format != cache_image.info.pixel_format) {
continue; continue;
} }
ASSERT_MSG((cache_image.info.type == info.type || info.size == Extent3D{1, 1, 1} ||
True(flags & FindFlags::RelaxFmt)),
"Image cache type mismatch: cache={}, info={}",
vk::to_string(cache_image.info.type), vk::to_string(info.type));
image_id = cache_id; image_id = cache_id;
} }