Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-14 13:45:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'main' into Feature/initial-ps4-ime-keyboard

Browse source
This commit is contained in:
Valdis Bogdāns 2025-04-23 08:21:59 +03:00 • committed by GitHub
commit 74377de666
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View file

@ -206,11 +206,11 @@ jobs:
mkdir upload mkdir upload
mv ${{github.workspace}}/build/shadps4 upload mv ${{github.workspace}}/build/shadps4 upload
cp ${{github.workspace}}/build/externals/MoltenVK/libMoltenVK.dylib upload cp ${{github.workspace}}/build/externals/MoltenVK/libMoltenVK.dylib upload
tar cf shadps4-macos-sdl.tar.gz -C upload . install_name_tool -add_rpath "@executable_path" upload/shadps4
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
with: with:
name: shadps4-macos-sdl-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }} name: shadps4-macos-sdl-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }}
path: shadps4-macos-sdl.tar.gz path: upload/
macos-qt: macos-qt:
runs-on: macos-15 runs-on: macos-15

8
src/common/path_util.cpp
View file

@ -60,7 +60,7 @@ static CFURLRef UntranslocateBundlePath(const CFURLRef bundle_path) {
return nullptr; return nullptr;
} }
static std::filesystem::path GetBundleParentDirectory() { static std::optional<std::filesystem::path> GetBundleParentDirectory() {
if (CFBundleRef bundle_ref = CFBundleGetMainBundle()) { if (CFBundleRef bundle_ref = CFBundleGetMainBundle()) {
if (CFURLRef bundle_url_ref = CFBundleCopyBundleURL(bundle_ref)) { if (CFURLRef bundle_url_ref = CFBundleCopyBundleURL(bundle_ref)) {
SCOPE_EXIT { SCOPE_EXIT {
@ -83,14 +83,16 @@ static std::filesystem::path GetBundleParentDirectory() {
} }
} }
} }
return std::filesystem::current_path(); return std::nullopt;
} }
#endif #endif
static auto UserPaths = [] { static auto UserPaths = [] {
#ifdef __APPLE__ #ifdef __APPLE__
// Set the current path to the directory containing the app bundle. // Set the current path to the directory containing the app bundle.
std::filesystem::current_path(GetBundleParentDirectory()); if (const auto bundle_dir = GetBundleParentDirectory()) {
std::filesystem::current_path(*bundle_dir);
}
#endif #endif
// Try the portable user directory first. // Try the portable user directory first.

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

@ -319,15 +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((cache_image.info.type == info.type || info.size == Extent3D{1, 1, 1} ||
True(flags & FindFlags::RelaxFmt)));
image_id = cache_id; image_id = cache_id;
} }