From eaff58aa813af16dea657b1ae0713a9b110ee319 Mon Sep 17 00:00:00 2001
From: Zephyron <zephyron@noreply.localhost>
Date: Mon, 8 Dec 2025 20:13:09 +0000
Subject: [PATCH] revert d5efa255ee8a5602f60fc96512b9ad3bc1c22796

revert refactor(vulkan): Remove redundant query cache segment notifications

- Remove NotifySegment(true) from PrepareDraw, DrawTexture, and Clear
- Remove NotifySegment(false) from AccelerateDisplay
- Add state tracking for transform feedback to avoid redundant CounterEnable calls
- Only call CounterEnable when transform feedback enable state changes

This prevents double resume/pause operations and state management conflicts.

Co-authored-by: Maufeat <maufeat@eden-emu.dev>
Signed-off-by: Zephyron <zephyron@citron-emu.org>
---
 .../renderer_vulkan/vk_rasterizer.cpp          | 18 +++++++++---------
 src/video_core/renderer_vulkan/vk_rasterizer.h |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
index ed8a89a40..31cfacef0 100644
--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp
+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
-// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <algorithm>
@@ -215,6 +214,8 @@ void RasterizerVulkan::PrepareDraw(bool is_indexed, Func&& draw_func) {
     FlushWork();
     gpu_memory->FlushCaching();
 
+    query_cache.NotifySegment(true);
+
     GraphicsPipeline* const pipeline{pipeline_cache.CurrentGraphicsPipeline()};
     if (!pipeline) {
         return;
@@ -306,6 +307,8 @@ void RasterizerVulkan::DrawTexture() {
     };
     FlushWork();
 
+    query_cache.NotifySegment(true);
+
     std::scoped_lock l{texture_cache.mutex};
     texture_cache.SynchronizeGraphicsDescriptors();
     texture_cache.UpdateRenderTargets(false);
@@ -352,6 +355,7 @@ void RasterizerVulkan::Clear(u32 layer_count) {
     FlushWork();
     gpu_memory->FlushCaching();
 
+    query_cache.NotifySegment(true);
     query_cache.CounterEnable(VideoCommon::QueryType::ZPassPixelCount64,
                               maxwell3d->regs.zpass_pixel_count_enable);
 
@@ -871,6 +875,7 @@ std::optional<FramebufferTextureInfo> RasterizerVulkan::AccelerateDisplay(
     if (!image_view) {
         return {};
     }
+    query_cache.NotifySegment(false);
 
     const auto& resolution = Settings::values.resolution_info;
 
@@ -1023,14 +1028,9 @@ void RasterizerVulkan::HandleTransformFeedback() {
         });
         return;
     }
-    // Only update counter state when transform feedback enable state changes
-    const bool transform_feedback_enabled = regs.transform_feedback_enabled != 0;
-    if (last_transform_feedback_enabled != transform_feedback_enabled) {
-        query_cache.CounterEnable(VideoCommon::QueryType::StreamingByteCount,
-                                  transform_feedback_enabled);
-        last_transform_feedback_enabled = transform_feedback_enabled;
-    }
-    if (transform_feedback_enabled) {
+    query_cache.CounterEnable(VideoCommon::QueryType::StreamingByteCount,
+                              regs.transform_feedback_enabled);
+    if (regs.transform_feedback_enabled != 0) {
         UNIMPLEMENTED_IF(regs.IsShaderConfigEnabled(Maxwell::ShaderType::TessellationInit) ||
                          regs.IsShaderConfigEnabled(Maxwell::ShaderType::Tessellation));
     }
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.h b/src/video_core/renderer_vulkan/vk_rasterizer.h
index da1428ea5..9107efa61 100644
--- a/src/video_core/renderer_vulkan/vk_rasterizer.h
+++ b/src/video_core/renderer_vulkan/vk_rasterizer.h
@@ -219,7 +219,6 @@ private:
     boost::container::static_vector<VkSampler, MAX_TEXTURES> sampler_handles;
 
     u32 draw_counter = 0;
-    bool last_transform_feedback_enabled = false;
 };
 
 } // namespace Vulkan