[Bf-blender-cvs] [927c300c022] soc-2019-openxr: Improve error messages & cleanup

[Julian Eisel]

Commit: 927c300c0221f47c0e44ea0ccabda3488318f564
Author: Julian Eisel
Date:   Tue Oct 15 22:04:22 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rB927c300c0221f47c0e44ea0ccabda3488318f564

Improve error messages & cleanup

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

M	intern/ghost/intern/GHOST_XrContext.cpp
M	intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
M	intern/ghost/intern/GHOST_XrSession.cpp

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

diff --git a/intern/ghost/intern/GHOST_XrContext.cpp b/intern/ghost/intern/GHOST_XrContext.cpp
index a829d91e917..6b00979630c 100644
--- a/intern/ghost/intern/GHOST_XrContext.cpp
+++ b/intern/ghost/intern/GHOST_XrContext.cpp
@@ -377,7 +377,7 @@ static const char *openxr_ext_name_from_wm_gpu_binding(GHOST_TXrGraphicsBinding
       return XR_KHR_D3D11_ENABLE_EXTENSION_NAME;
 #endif
     case GHOST_kXrGraphicsUnknown:
-      assert(false);
+      assert(!"Could not identify graphics binding to choose.");
       return nullptr;
   }
 
diff --git a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
index c00f70aa1d5..87cc2ddd899 100644
--- a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
+++ b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
@@ -214,7 +214,7 @@ class GHOST_XrGraphicsBindingD3D : public GHOST_IXrGraphicsBinding {
 
     if (r_requirement_info) {
       std::ostringstream strstream;
-      strstream << "Min DirectX 11 Feature Level " << gpu_requirements.minFeatureLevel
+      strstream << "Minimum DirectX 11 Feature Level " << gpu_requirements.minFeatureLevel
                 << std::endl;
 
       *r_requirement_info = std::move(strstream.str());
diff --git a/intern/ghost/intern/GHOST_XrSession.cpp b/intern/ghost/intern/GHOST_XrSession.cpp
index 2ed2b229a76..2f77ddf2781 100644
--- a/intern/ghost/intern/GHOST_XrSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cpp
@@ -117,7 +117,9 @@ static void create_reference_space(OpenXRSessionData *oxr, const GHOST_XrPose *b
 
   create_info.referenceSpaceType = XR_REFERENCE_SPACE_TYPE_LOCAL;
 #if 0
-/* Proper reference space set up is not supported yet. We simply hand OpenXR
+/* TODO
+ *
+ * Proper reference space set up is not supported yet. We simply hand OpenXR
  * the global space as reference space and apply its pose onto the active
  * camera matrix to get a basic viewing experience going. If there's no active
  * camera with stick to the world origin.