From: Eric Engestrom <eric.engestrom@intel.com>
Date: Tue, 23 Oct 2018 14:37:21 +0000 (+0100)
Subject: anv: move variable to proper scope and mark as MAYBE_UNUSED
X-Git-Tag: android-x86-8.1-r1~371
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=edc06dd5332f3efa4ef1f9b431fb2cf226441f1b;p=android-x86%2Fexternal-mesa.git

anv: move variable to proper scope and mark as MAYBE_UNUSED

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---

diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c
index e0c0a42069f..cf063701b8d 100644
--- a/src/intel/vulkan/anv_queue.c
+++ b/src/intel/vulkan/anv_queue.c
@@ -542,8 +542,6 @@ anv_wait_for_bo_fences(struct anv_device *device,
                        bool waitAll,
                        uint64_t _timeout)
 {
-   int ret;
-
    /* DRM_IOCTL_I915_GEM_WAIT uses a signed 64 bit timeout and is supposed
     * to block indefinitely timeouts <= 0.  Unfortunately, this was broken
     * for a couple of kernel releases.  Since there's no way to know
@@ -647,6 +645,7 @@ anv_wait_for_bo_fences(struct anv_device *device,
             abstime.tv_nsec = abs_nsec;
             abstime.tv_sec = MIN2(abs_sec, INT_TYPE_MAX(abstime.tv_sec));
 
+            MAYBE_UNUSED int ret;
             ret = pthread_cond_timedwait(&device->queue_submit,
                                          &device->mutex, &abstime);
             assert(ret != EINVAL);