VERY experimental Nintendo Switch 2 emulator
C++
Query Cache: Fix behavior in Normal Accuracy
Fernando Sahmkow509ebe61c660
diff --git a/src/video_core/query_cache/query_cache.h b/src/video_core/query_cache/query_cache.hindex 4b89b5bf6b..78b42b518b 100644--- a/src/video_core/query_cache/query_cache.h+++ b/src/video_core/query_cache/query_cache.h@@ -256,6 +256,7 @@ void QueryCacheBase<Traits>::CounterReport(GPUVAddr addr, QueryType counter_typeu8* pointer = impl->cpu_memory.GetPointer(cpu_addr);u8* pointer_timestamp = impl->cpu_memory.GetPointer(cpu_addr + 8);bool is_synced = !Settings::IsGPULevelHigh() && is_fence;+std::function<void()> operation([this, is_synced, streamer, query_base = query, query_location,pointer, pointer_timestamp] {if (True(query_base->flags & QueryFlagBits::IsInvalidated)) {@@ -285,6 +286,18 @@ void QueryCacheBase<Traits>::CounterReport(GPUVAddr addr, QueryType counter_typeif (is_fence) {impl->rasterizer.SignalFence(std::move(operation));} else {+ if (!Settings::IsGPULevelHigh() && counter_type == QueryType::Payload) {+ if (has_timestamp) {+ u64 timestamp = impl->gpu.GetTicks();+ u64 value = static_cast<u64>(payload);+ std::memcpy(pointer_timestamp, ×tamp, sizeof(timestamp));+ std::memcpy(pointer, &value, sizeof(value));+ } else {+ std::memcpy(pointer, &payload, sizeof(payload));+ }+ streamer->Free(new_query_id);+ return;+ }impl->rasterizer.SyncOperation(std::move(operation));}if (is_synced) {diff --git a/src/video_core/renderer_vulkan/vk_query_cache.cpp b/src/video_core/renderer_vulkan/vk_query_cache.cppindex 825e1a72ee..2cc0077162 100644--- a/src/video_core/renderer_vulkan/vk_query_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_query_cache.cpp@@ -1365,6 +1365,11 @@ bool QueryCacheRuntime::HostConditionalRenderingCompareValues(VideoCommon::Lookureturn false;}+ const bool is_gpu_high = Settings::IsGPULevelHigh();+ if (!is_gpu_high && impl->device.GetDriverID() == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS) {+ return true;+ }+for (size_t i = 0; i < 2; i++) {is_null[i] = !is_in_ac[i] && check_value(objects[i]->address);}@@ -1376,6 +1381,11 @@ bool QueryCacheRuntime::HostConditionalRenderingCompareValues(VideoCommon::Lookureturn true;}}++ if (!is_gpu_high) {+ return true;+ }+if (!is_in_bc[0] && !is_in_bc[1]) {// Both queries are in query cache, it's best to just flush.return true;