summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2019-12-03 16:50:22 +0400
committerMarc-André Lureau <marcandre.lureau@redhat.com>2019-12-03 16:52:16 +0400
commit1504b62655800c4bd5eafb460c69ff71a04f9a81 (patch)
treebc5fbb2a55b589f909bd7160f18ef5974d6a1605
parent3ec182aaf77be783672f5d63bd52e0b8071eb686 (diff)
Fix some -Wpedantic warnings
Fixes: warning: ISO C forbids ‘return’ with expression, in function returning void Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-rw-r--r--src/virglrenderer.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/virglrenderer.c b/src/virglrenderer.c
index 1447f33..82cce84 100644
--- a/src/virglrenderer.c
+++ b/src/virglrenderer.c
@@ -162,7 +162,7 @@ int virgl_renderer_resource_attach_iov(int res_handle, struct iovec *iov,
void virgl_renderer_resource_detach_iov(int res_handle, struct iovec **iov_p, int *num_iovs_p)
{
- return vrend_renderer_resource_detach_iov(res_handle, iov_p, num_iovs_p);
+ vrend_renderer_resource_detach_iov(res_handle, iov_p, num_iovs_p);
}
int virgl_renderer_create_fence(int client_fence_id, uint32_t ctx_id)
@@ -244,14 +244,18 @@ static virgl_renderer_gl_context create_gl_context(int scanout_idx, struct virgl
static void destroy_gl_context(virgl_renderer_gl_context ctx)
{
#ifdef HAVE_EPOXY_EGL_H
- if (use_context == CONTEXT_EGL)
- return virgl_egl_destroy_context(egl, ctx);
+ if (use_context == CONTEXT_EGL) {
+ virgl_egl_destroy_context(egl, ctx);
+ return;
+ }
#endif
#ifdef HAVE_EPOXY_GLX_H
- if (use_context == CONTEXT_GLX)
- return virgl_glx_destroy_context(glx_info, ctx);
+ if (use_context == CONTEXT_GLX) {
+ virgl_glx_destroy_context(glx_info, ctx);
+ return;
+ }
#endif
- return rcbs->destroy_gl_context(dev_cookie, ctx);
+ rcbs->destroy_gl_context(dev_cookie, ctx);
}
static int make_current(virgl_renderer_gl_context ctx)