[Bf-blender-cvs] [6a998833cdc] soc-2019-openxr: Temporarily let DirectX take priority over OpenGL
Julian Eisel
noreply at git.blender.org
Tue Jul 16 21:50:18 CEST 2019
Commit: 6a998833cdc08024e259589a72a77e7ba3b4ea8b
Author: Julian Eisel
Date: Tue Jul 16 21:47:46 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rB6a998833cdc08024e259589a72a77e7ba3b4ea8b
Temporarily let DirectX take priority over OpenGL
OpenGL doesn't work yet. Shouldn't be too difficult to get working, but
I don't have a working OpenXR runtime with OpenGL support to test here.
===================================================================
M source/blender/windowmanager/intern/wm_xr.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index f3c5d415d32..85c99c7897b 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -99,10 +99,12 @@ bool wm_xr_context_ensure(bContext *C, wmWindowManager *wm)
{
const GHOST_TXrGraphicsBinding gpu_bindings_candidates[] = {
- GHOST_kXrGraphicsOpenGL,
+ /* TODO temporarily letting D3D take priority, OpenGL doesn't work yet */
+ // GHOST_kXrGraphicsOpenGL,
#ifdef WIN32
GHOST_kXrGraphicsD3D11,
#endif
+ GHOST_kXrGraphicsOpenGL,
};
GHOST_XrContextCreateInfo create_info = {
.gpu_binding_candidates = gpu_bindings_candidates,
More information about the Bf-blender-cvs
mailing list