From 3f38a8526c1478444f72a2fe39f2ac8f0c547208 Mon Sep 17 00:00:00 2001
From: riperiperi <rhy3756547@hotmail.com>
Date: Sun, 23 Jan 2022 19:05:02 +0000
Subject: [PATCH] Port #3019

---
 Ryujinx.Graphics.Vulkan/Queries/BufferedQuery.cs |  6 +++++-
 Ryujinx.Graphics.Vulkan/Queries/CounterQueue.cs  | 15 +++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Ryujinx.Graphics.Vulkan/Queries/BufferedQuery.cs b/Ryujinx.Graphics.Vulkan/Queries/BufferedQuery.cs
index 092376d99..dd2f348fe 100644
--- a/Ryujinx.Graphics.Vulkan/Queries/BufferedQuery.cs
+++ b/Ryujinx.Graphics.Vulkan/Queries/BufferedQuery.cs
@@ -84,7 +84,11 @@ namespace Ryujinx.Graphics.Vulkan.Queries
             {
                 Marshal.WriteInt64(_bufferMap, DefaultValue);
                 _pipeline.CopyQueryResults(_queryPool, _buffer);
-                // _pipeline.FlushCommandsImpl();
+            }
+            else
+            {
+                // Dummy result, just return 0.
+                Marshal.WriteInt64(_bufferMap, 0);
             }
         }
 
diff --git a/Ryujinx.Graphics.Vulkan/Queries/CounterQueue.cs b/Ryujinx.Graphics.Vulkan/Queries/CounterQueue.cs
index 6f0b25c60..d32ae2ec4 100644
--- a/Ryujinx.Graphics.Vulkan/Queries/CounterQueue.cs
+++ b/Ryujinx.Graphics.Vulkan/Queries/CounterQueue.cs
@@ -125,19 +125,10 @@ namespace Ryujinx.Graphics.Vulkan.Queries
                     _current.ReserveForHostAccess();
                 }
 
-                if (draws > 0 && Type != CounterType.TransformFeedbackPrimitivesWritten)
-                {
-                    _current.Complete(true);
-                    _events.Enqueue(_current);
+                _current.Complete(draws > 0 && Type != CounterType.TransformFeedbackPrimitivesWritten);
+                _events.Enqueue(_current);
 
-                    _current.OnResult += resultHandler;
-                }
-                else
-                {
-                    _current.Complete(false);
-                    _current.Dispose();
-                    resultHandler(_current, 0);
-                }
+                _current.OnResult += resultHandler;
 
                 result = _current;