[Bf-blender-cvs] [df8dc439461] soc-2019-openxr: Fix compile errors and warnings on certain configs
Julian Eisel
noreply at git.blender.org
Sun Jun 16 23:30:39 CEST 2019
Commit: df8dc43946115d3da8dc27ae24aa54a9f4def1e1
Author: Julian Eisel
Date: Sun Jun 16 23:28:14 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBdf8dc43946115d3da8dc27ae24aa54a9f4def1e1
Fix compile errors and warnings on certain configs
Addresses:
* Compile error on Linux
* Compile error with WITH_OPENXR disabled
* Unused parameter warnings
===================================================================
M intern/ghost/intern/GHOST_Context.h
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/intern/ghost/intern/GHOST_Context.h b/intern/ghost/intern/GHOST_Context.h
index cd32f250967..16feb98d1b9 100644
--- a/intern/ghost/intern/GHOST_Context.h
+++ b/intern/ghost/intern/GHOST_Context.h
@@ -141,7 +141,7 @@ class GHOST_Context : public GHOST_IContext {
* \note This actually changes the window size! That is the only way to change the default
* framebuffer size. Better only use for offscreen contexts.
*/
- virtual GHOST_TSuccess setDefaultFramebufferSize(GHOST_TUns32 width, GHOST_TUns32 height)
+ virtual GHOST_TSuccess setDefaultFramebufferSize(GHOST_TUns32 /*width*/, GHOST_TUns32 /*height*/)
{
return GHOST_kFailure;
}
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 0a999e17a9e..f7b8fb5d6d6 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -837,10 +837,12 @@ wmWindow *WM_window_open(bContext *C, const rcti *rect)
{
return wm_window_open_ex(C, rect, GHOST_kDrawingContextTypeOpenGL);
}
+#ifdef WIN32
wmWindow *WM_window_open_directx(bContext *C, const rcti *rect)
{
return wm_window_open_ex(C, rect, GHOST_kDrawingContextTypeD3D);
}
+#endif
/**
* Uses `screen->temp` tag to define what to do, currently it limits
@@ -1657,7 +1659,9 @@ void wm_window_process_events(const bContext *C)
GHOST_DispatchEvents(g_system);
}
hasevent |= wm_window_timer(C);
+#ifdef WITH_OPENXR
hasevent |= wm_xr_events_handle(CTX_wm_xr_context(C));
+#endif
/* no event, we sleep 5 milliseconds */
if (hasevent == 0) {
More information about the Bf-blender-cvs
mailing list