Fix wrong case checking to unreachable code. 10/257810/1
authorJoonbum Ko <joonbum.ko@samsung.com>
Mon, 3 May 2021 07:48:35 +0000 (16:48 +0900)
committerJoonbum Ko <joonbum.ko@samsung.com>
Mon, 3 May 2021 07:48:35 +0000 (16:48 +0900)
Change-Id: Id5bc26ba2cb5eb9cdadae12d751750ae7d243a9e
Signed-off-by: Joonbum Ko <joonbum.ko@samsung.com>
src/tpl_wl_vk_thread.c

index 67d2256721fbae86236f56548aecde3c39c5a0c0..735c808c266e88a04d97e37818ad82d52d0b1196 100644 (file)
@@ -897,7 +897,7 @@ _tpl_wl_vk_surface_buffer_clear(tpl_wl_vk_surface_t *wl_vk_surface)
 {
        tbm_surface_queue_error_e tsq_err       = TBM_SURFACE_QUEUE_ERROR_NONE;
        tpl_wl_vk_display_t *wl_vk_display      = wl_vk_surface->wl_vk_display;
-       tpl_wl_vk_swapchain_t *swapchain        = NULL;
+       tpl_wl_vk_swapchain_t *swapchain        = wl_vk_surface->swapchain;
        tpl_wl_vk_buffer_t *wl_vk_buffer        = NULL;
        tpl_bool_t need_to_release              = TPL_FALSE;
        tpl_bool_t need_to_cancel               = TPL_FALSE;
@@ -1887,8 +1887,8 @@ _wl_vk_buffer_create(tpl_wl_vk_surface_t *wl_vk_surface,
 
 static tbm_surface_h
 __tpl_wl_vk_surface_dequeue_buffer(tpl_surface_t *surface,
-                                                                          uint64_t timeout_ns,
-                                                                          int32_t *release_fence)
+                                                                  uint64_t timeout_ns,
+                                                                  int32_t *release_fence)
 {
        TPL_ASSERT(surface);
        TPL_ASSERT(surface->backend.data);
@@ -1903,8 +1903,6 @@ __tpl_wl_vk_surface_dequeue_buffer(tpl_surface_t *surface,
        tpl_wl_vk_swapchain_t *swapchain   = wl_vk_surface->swapchain;
        tpl_wl_vk_buffer_t *wl_vk_buffer   = NULL;
 
-       tpl_result_t res                   = TPL_ERROR_NONE;
-
        tbm_surface_h tbm_surface          = NULL;
        tbm_surface_queue_error_e tsq_err  = TBM_SURFACE_QUEUE_ERROR_NONE;
 
@@ -1923,13 +1921,13 @@ __tpl_wl_vk_surface_dequeue_buffer(tpl_surface_t *surface,
        TRACE_END();
        TPL_OBJECT_LOCK(surface);
 
-       if (res == TPL_ERROR_TIME_OUT) {
+       if (tsq_err == TBM_SURFACE_QUEUE_ERROR_TIMEOUT) {
                TPL_ERR("Failed to get buffer during timeout_ns(%" PRIu64 ")",
                                timeout_ns);
                return NULL;
-       } else if (res != TPL_ERROR_NONE) {
-               TPL_ERR("Invalid operation. wl_vk_surface(%p) tbm_queue(%p)",
-                               wl_vk_surface, swapchain->tbm_queue);
+       } else if (tsq_err != TBM_SURFACE_QUEUE_ERROR_NONE) {
+               TPL_ERR("Invalid operation. wl_vk_surface(%p) tbm_queue(%p) tsq_err(%d)",
+                               wl_vk_surface, swapchain->tbm_queue, tsq_err);
                return NULL;
        }