[Bf-blender-cvs] [9abf5ba1d54] soc-2019-openxr: Merge branch 'temp-openxr-blenderside' into soc-2019-openxr

Julian Eisel noreply at git.blender.org
Tue Mar 10 16:34:46 CET 2020


Commit: 9abf5ba1d544c1142242a351e9c38c2671cdf3c2
Author: Julian Eisel
Date:   Tue Mar 10 16:34:26 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rB9abf5ba1d544c1142242a351e9c38c2671cdf3c2

Merge branch 'temp-openxr-blenderside' into soc-2019-openxr

===================================================================



===================================================================

diff --cc intern/ghost/intern/GHOST_XrSession.cpp
index 0a622256aa4,818e9322ea7..1e2b8c0bc9d
--- a/intern/ghost/intern/GHOST_XrSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cpp
@@@ -425,14 -362,15 +362,14 @@@ static void ghost_xr_draw_view_info_fro
  
  static bool ghost_xr_draw_view_expects_srgb_buffer(const GHOST_XrContext *context)
  {
 -  /* WMR seems to be faulty and doesn't do OETF transform correctly. So expect a SRGB buffer to
 +  /* Monado seems to be faulty and doesn't do OETF transform correctly. So expect a SRGB buffer to
     * compensate. You get way too dark rendering without this, it's pretty obvious (even in the
     * default startup scene). */
 -  return (context->getOpenXRRuntimeID() == OPENXR_RUNTIME_WMR) ||
 -         (context->getOpenXRRuntimeID() == OPENXR_RUNTIME_MONADO);
 +  return (context->getOpenXRRuntimeID() == OPENXR_RUNTIME_MONADO);
  }
  
- void GHOST_XrSession::drawView(XrSwapchain swapchain,
-                                XrCompositionLayerProjectionView &proj_layer_view,
+ void GHOST_XrSession::drawView(GHOST_XrSwapchain &swapchain,
+                                XrCompositionLayerProjectionView &r_proj_layer_view,
                                 XrView &view,
                                 void *draw_customdata)
  {



More information about the Bf-blender-cvs mailing list