summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2018-07-17 13:13:40 +0100
committerEric Engestrom <[email protected]>2018-08-23 14:47:59 +0100
commit993a456360df6dc40f98bd199d3cbd259dd91a42 (patch)
tree72f4aa3b4139ba9e17472541d1b249190f80ac84
parenta0f6a1194464611bd93491c6d066b07db0615f27 (diff)
vk/wsi: avoid reading uninitialised memory
It will be ignored by x11_swapchain_result() anyway (because reaching the `fail` label without setting `result` means the swapchain status was already a hard error), but the compiler still complains about reading uninitialised memory. While at it, drop the unused assignment right before returning. Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Caio Marcelo de Oliveira Filho <[email protected]>
-rw-r--r--src/vulkan/wsi/wsi_common_x11.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
index aaa4d1e658e..d4c1790575f 100644
--- a/src/vulkan/wsi/wsi_common_x11.c
+++ b/src/vulkan/wsi/wsi_common_x11.c
@@ -980,7 +980,7 @@ static void *
x11_manage_fifo_queues(void *state)
{
struct x11_swapchain *chain = state;
- VkResult result;
+ VkResult result = VK_SUCCESS;
assert(chain->base.present_mode == VK_PRESENT_MODE_FIFO_KHR);
@@ -1024,7 +1024,7 @@ x11_manage_fifo_queues(void *state)
}
fail:
- result = x11_swapchain_result(chain, result);
+ x11_swapchain_result(chain, result);
wsi_queue_push(&chain->acquire_queue, UINT32_MAX);
return NULL;