Mesa (master): virgl: Fix unused var warnings in release build from assertions.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Aug 28 23:02:37 UTC 2020


Module: Mesa
Branch: master
Commit: 60fb460f9d7154c8080b0be2d59013917ff4ad6f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=60fb460f9d7154c8080b0be2d59013917ff4ad6f

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Aug 25 11:36:22 2020 -0700

virgl: Fix unused var warnings in release build from assertions.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6462>

---

 src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c
index 463bff01f32..f24116e32da 100644
--- a/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c
+++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c
@@ -148,7 +148,7 @@ static int virgl_vtest_negotiate_version(struct virgl_vtest_winsys *vws)
    uint32_t version_buf[VCMD_PROTOCOL_VERSION_SIZE];
    uint32_t busy_wait_buf[VCMD_BUSY_WAIT_SIZE];
    uint32_t busy_wait_result[1];
-   int ret;
+   ASSERTED int ret;
 
    vtest_hdr[VTEST_CMD_LEN] = VCMD_PING_PROTOCOL_VERSION_SIZE;
    vtest_hdr[VTEST_CMD_ID] = VCMD_PING_PROTOCOL_VERSION;
@@ -521,7 +521,7 @@ int virgl_vtest_busy_wait(struct virgl_vtest_winsys *vws, int handle,
    uint32_t vtest_hdr[VTEST_HDR_SIZE];
    uint32_t cmd[VCMD_BUSY_WAIT_SIZE];
    uint32_t result[1];
-   int ret;
+   ASSERTED int ret;
    vtest_hdr[VTEST_CMD_LEN] = VCMD_BUSY_WAIT_SIZE;
    vtest_hdr[VTEST_CMD_ID] = VCMD_RESOURCE_BUSY_WAIT;
    cmd[VCMD_BUSY_WAIT_HANDLE] = handle;



More information about the mesa-commit mailing list