vulkan/overlay: fix timestamp query emission with no pipeline stats
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>
Thu, 16 May 2019 15:59:46 +0000 (16:59 +0100)
committerLionel Landwerlin <lionel.g.landwerlin@intel.com>
Tue, 21 May 2019 13:08:35 +0000 (14:08 +0100)
The
   if (!pipe && timestamp)

logic was broken. It should have been :

   if (!pipe && !timestamp)

Let just drop this condition as the following code does the right
thing for all cases.

An error was appearing with the following variables :

VK_INSTANCE_LAYERS=VK_LAYER_MESA_overlay VK_LAYER_MESA_OVERLAY_CONFIG=gpu_timing

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: ea7a6fa98055ad ("vulkan/overlay: add pipeline statistic & timestamps support")
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
src/vulkan/overlay-layer/overlay.cpp

index 7d24c64886eec2bbbe58c280168ed53ee2f9f7eb..5b761eefc8a6319300bde4e36732c2c8393903e8 100644 (file)
@@ -1893,10 +1893,6 @@ static VkResult overlay_BeginCommandBuffer(
       return result;
    }
 
-   /* Primary command buffers with no queries. */
-   if (!cmd_buffer_data->pipeline_query_pool && cmd_buffer_data->timestamp_query_pool)
-      return device_data->vtable.BeginCommandBuffer(commandBuffer, pBeginInfo);
-
    /* Otherwise record a begin query as first command. */
    VkResult result = device_data->vtable.BeginCommandBuffer(commandBuffer, pBeginInfo);