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>
Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
macos/master
Marc-André Lureau 5 years ago
parent bbcac75eb4
commit f6d31cf8f7
  1. 16
      src/virglrenderer.c

@ -161,7 +161,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) 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) int virgl_renderer_create_fence(int client_fence_id, uint32_t ctx_id)
@ -243,14 +243,18 @@ static virgl_renderer_gl_context create_gl_context(int scanout_idx, struct virgl
static void destroy_gl_context(virgl_renderer_gl_context ctx) static void destroy_gl_context(virgl_renderer_gl_context ctx)
{ {
#ifdef HAVE_EPOXY_EGL_H #ifdef HAVE_EPOXY_EGL_H
if (use_context == CONTEXT_EGL) if (use_context == CONTEXT_EGL) {
return virgl_egl_destroy_context(egl, ctx); virgl_egl_destroy_context(egl, ctx);
return;
}
#endif #endif
#ifdef HAVE_EPOXY_GLX_H #ifdef HAVE_EPOXY_GLX_H
if (use_context == CONTEXT_GLX) if (use_context == CONTEXT_GLX) {
return virgl_glx_destroy_context(glx_info, ctx); virgl_glx_destroy_context(glx_info, ctx);
return;
}
#endif #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) static int make_current(virgl_renderer_gl_context ctx)

Loading…
Cancel
Save