[PR #3084] [MERGED] Core: Merge Direct Memory Areas #3207

New issue

Closed

opened 2026-02-27 22:02:50 +03:00 by kerem · 0 comments

kerem commented

2026-02-27 22:02:50 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/shadps4-emu/shadPS4/pull/3084
Author: @StevenMiller123
Created: 6/11/2025
Status: ✅ Merged
Merged: 6/11/2025
Merged by: @georgemoralis

Base: main ← Head: dmem-merge-fix

📝 Commits (5)

324c9f1 Merge dmem areas
9bcabc3 Fix DirectMemoryArea::CanMergeWith
6209c7e Reduce some warnings to info
fc73929 Clang
968b98e Merge branch 'shadps4-emu:main' into dmem-merge-fix

📊 Changes

3 files changed (+7 additions, -3 deletions)

View changed files

📝 src/core/libraries/kernel/memory.cpp (+3 -3)
📝 src/core/memory.cpp (+1 -0)
📝 src/core/memory.h (+3 -0)

📄 Description

Reverts the changes from #3059 in favor of actually fixing the issue seen with P.T.
The issue was that we were ignoring direct memory types when deciding to coalesce pages. Checking for this properly fixes the regression previously seen in P.T., as confirmed by @kalaposfos13.

This isn't known to fix anything yet, but it is more accurate to real PS4 behavior.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/shadps4-emu/shadPS4/pull/3084 **Author:** [@StevenMiller123](https://github.com/StevenMiller123) **Created:** 6/11/2025 **Status:** ✅ Merged **Merged:** 6/11/2025 **Merged by:** [@georgemoralis](https://github.com/georgemoralis) **Base:** `main` ← **Head:** `dmem-merge-fix` --- ### 📝 Commits (5) - [`324c9f1`](https://github.com/shadps4-emu/shadPS4/commit/324c9f1bf0cf62000ed87c53dc424f606765dc28) Merge dmem areas - [`9bcabc3`](https://github.com/shadps4-emu/shadPS4/commit/9bcabc3bc5b39fa96bd244ee57559547a4e4f816) Fix DirectMemoryArea::CanMergeWith - [`6209c7e`](https://github.com/shadps4-emu/shadPS4/commit/6209c7edb6190cd6d16b43fd7ba2b9d8f6db9567) Reduce some warnings to info - [`fc73929`](https://github.com/shadps4-emu/shadPS4/commit/fc7392966e761cba989cf74197d4ba92efafbdd3) Clang - [`968b98e`](https://github.com/shadps4-emu/shadPS4/commit/968b98e512644b245056dc9e74bf0cf69e95d405) Merge branch 'shadps4-emu:main' into dmem-merge-fix ### 📊 Changes **3 files changed** (+7 additions, -3 deletions) <details> <summary>View changed files</summary> 📝 `src/core/libraries/kernel/memory.cpp` (+3 -3) 📝 `src/core/memory.cpp` (+1 -0) 📝 `src/core/memory.h` (+3 -0) </details> ### 📄 Description Reverts the changes from #3059 in favor of actually fixing the issue seen with P.T. The issue was that we were ignoring direct memory types when deciding to coalesce pages. Checking for this properly fixes the regression previously seen in P.T., as confirmed by @kalaposfos13. This isn't known to fix anything yet, but it is more accurate to real PS4 behavior. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>