debuggerx/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-08-21 07:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[video_core] Avoid stale macro upload references

Browse Source
This commit is contained in:
xbzk
2026-08-01 16:02:40 -03:00
parent e5b247db35
commit a0bc8bfde4
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/video_core/macro.cpp
+9 -12
View File
@@ -1391,29 +1391,26 @@ void MacroEngine::Execute(Core::System& system, Engines::Maxwell3D& maxwell3d, u
std::span<const u32> code;
auto macro_code = uploaded_macro_code.find(method);
if (macro_code == uploaded_macro_code.end()) {
std::optional<u32> mid_method;
for (const auto& [method_base, uploaded_code] : uploaded_macro_code) {
for (auto it = uploaded_macro_code.begin(); it != uploaded_macro_code.end(); ++it) {
const auto& [method_base, uploaded_code] = *it;
if (method >= method_base && (method - method_base) < uploaded_code.size()) {
mid_method = method_base;
macro_code = it;
break;
}
}
if (!mid_method) {
if (macro_code == uploaded_macro_code.end()) {
ASSERT_MSG(false, "Macro 0x{0:x} was not uploaded", method);
return;
}
const auto source = uploaded_macro_code.find(*mid_method);
ASSERT(source != uploaded_macro_code.end());
const auto rebased_method = method - *mid_method;
std::vector<u32> rebased_code(source->second.begin() + rebased_method,
source->second.end());
const auto rebased_method = method - macro_code->first;
std::vector<u32> rebased_code(macro_code->second.begin() + rebased_method,
macro_code->second.end());
const auto [it, inserted] = uploaded_macro_code.emplace(method, std::move(rebased_code));
ASSERT(inserted);
code = it->second;
} else {
code = macro_code->second;
macro_code = it;
}
code = macro_code->second;
auto& ci = macro_cache[method];
ci.hash = Common::HashRange(code.begin(), code.end());