mirrors/suyu
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Merge branch 'master' into 'dev'"

Browse source 
This reverts merge request !17
This commit is contained in:
Crimson Hawk 2024-03-06 05:26:38 +00:00
parent fdadc50fff
commit cdbdf63ebe
2887 changed files with 18295 additions and 18366 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/video_core/query_cache.h
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2020 suyu Emulator Project
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
@ -253,8 +253,8 @@ private:
return cache_begin < addr_end && addr_begin < cache_end;
};
const u64 page_end = addr_end >> suyu_PAGEBITS;
for (u64 page = addr_begin >> suyu_PAGEBITS; page <= page_end; ++page) {
const u64 page_end = addr_end >> YUZU_PAGEBITS;
for (u64 page = addr_begin >> YUZU_PAGEBITS; page <= page_end; ++page) {
const auto& it = cached_queries.find(page);
if (it == std::end(cached_queries)) {
continue;
@ -281,14 +281,14 @@ private:
/// Registers the passed parameters as cached and returns a pointer to the stored cached query.
CachedQuery* Register(VideoCore::QueryType type, VAddr cpu_addr, u8* host_ptr, bool timestamp) {
const u64 page = static_cast<u64>(cpu_addr) >> suyu_PAGEBITS;
const u64 page = static_cast<u64>(cpu_addr) >> YUZU_PAGEBITS;
return &cached_queries[page].emplace_back(static_cast<QueryCache&>(*this), type, cpu_addr,
host_ptr);
}
/// Tries to a get a cached query. Returns nullptr on failure.
CachedQuery* TryGet(VAddr addr) {
const u64 page = static_cast<u64>(addr) >> suyu_PAGEBITS;
const u64 page = static_cast<u64>(addr) >> YUZU_PAGEBITS;
const auto it = cached_queries.find(page);
if (it == std::end(cached_queries)) {
return nullptr;
@ -338,8 +338,8 @@ private:
rasterizer.SyncOperation(std::move(operation));
}
static constexpr std::uintptr_t suyu_PAGESIZE = 4096;
static constexpr unsigned suyu_PAGEBITS = 12;
static constexpr std::uintptr_t YUZU_PAGESIZE = 4096;
static constexpr unsigned YUZU_PAGEBITS = 12;
Common::SlotVector<AsyncJob> slot_async_jobs;