From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 28 May 2015 17:27:50 +0000 (-0700)
Subject: vk/query: Don't emit a CS stall by itself
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8cf932fd254b3c35e93b2898fdda95f611ea9f7a;p=mesa.git

vk/query: Don't emit a CS stall by itself

Both the bspec and the simulator don't like this.  I'm not sure if stalling
at the scoreboard is right but it at least shuts up the simulator.
---

diff --git a/src/vulkan/device.c b/src/vulkan/device.c
index a5e4d9ffe6c..9bd3f60bfde 100644
--- a/src/vulkan/device.c
+++ b/src/vulkan/device.c
@@ -3317,7 +3317,8 @@ void anv_CmdCopyQueryPoolResults(
    /* FIXME: If we're not waiting, should we just do this on the CPU? */
    if (flags & VK_QUERY_RESULT_WAIT_BIT)
       anv_batch_emit(&cmd_buffer->batch, GEN8_PIPE_CONTROL,
-                     .CommandStreamerStallEnable = true);
+                     .CommandStreamerStallEnable = true,
+                     .StallAtPixelScoreboard = true);
 
    dst_offset = buffer->offset + destOffset;
    for (uint32_t i = 0; i < queryCount; i++) {