Module: Mesa Branch: staging/19.1 Commit: ce2d68aaceeec30db9128312384e01206d21d1d9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce2d68aaceeec30db9128312384e01206d21d1d9
Author: Lionel Landwerlin <[email protected]> Date: Thu May 16 16:59:46 2019 +0100 vulkan/overlay: fix timestamp query emission with no pipeline stats 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 <[email protected]> Fixes: ea7a6fa98055ad ("vulkan/overlay: add pipeline statistic & timestamps support") Reviewed-by: Tapani Pälli <[email protected]> (cherry picked from commit 213d6527d49aeafe28d2bd320ad462730e0d56eb) --- src/vulkan/overlay-layer/overlay.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/vulkan/overlay-layer/overlay.cpp b/src/vulkan/overlay-layer/overlay.cpp index 7d24c64886e..5b761eefc8a 100644 --- a/src/vulkan/overlay-layer/overlay.cpp +++ b/src/vulkan/overlay-layer/overlay.cpp @@ -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); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
