diff options
author | Julian Eisel <julian@blender.org> | 2020-04-02 19:44:58 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-04-02 19:46:12 +0300 |
commit | 6eb409bb9cb6333bbc30b12b683a4b739850652d (patch) | |
tree | 658b9483eecd7e464e6ecb9b18ff9d230600291c | |
parent | 12628e0794af1c1f1bfc7e39260c3c33b84984b4 (diff) |
Fix warnings caused by own earlier commit
Caused by 34465a7fb091.
-rw-r--r-- | intern/ghost/GHOST_Types.h | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_XrGraphicsBinding.cpp | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_xr.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index 6667d113fe8..eb844c9e574 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -621,7 +621,7 @@ typedef void (*GHOST_XrErrorHandlerFn)(const struct GHOST_XrError *); typedef void (*GHOST_XrSessionExitFn)(void *customdata); -typedef void *(*GHOST_XrGraphicsContextBindFn)(); +typedef void *(*GHOST_XrGraphicsContextBindFn)(void); typedef void (*GHOST_XrGraphicsContextUnbindFn)(GHOST_ContextHandle graphics_context); typedef void (*GHOST_XrDrawViewFn)(const struct GHOST_XrDrawViewInfo *draw_view, void *customdata); diff --git a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp index fa4ca2283ea..e8de5d1bed7 100644 --- a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp +++ b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp @@ -338,4 +338,6 @@ std::unique_ptr<GHOST_IXrGraphicsBinding> GHOST_XrGraphicsBindingCreateFromType( default: return nullptr; } + + (void)context; /* Might be unused. */ } diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c index 5115607101c..be0c8b4798b 100644 --- a/source/blender/windowmanager/intern/wm_xr.c +++ b/source/blender/windowmanager/intern/wm_xr.c @@ -68,7 +68,7 @@ struct wmXrRuntimeData *wm_xr_runtime_data_create(void); void wm_xr_runtime_data_free(struct wmXrRuntimeData **runtime); void wm_xr_draw_view(const GHOST_XrDrawViewInfo *, void *); -void *wm_xr_session_gpu_binding_context_create(); +void *wm_xr_session_gpu_binding_context_create(void); void wm_xr_session_gpu_binding_context_destroy(GHOST_ContextHandle); wmSurface *wm_xr_session_surface_create(void); void wm_xr_pose_to_viewmat(const GHOST_XrPose *pose, float r_viewmat[4][4]); |