[Bf-blender-cvs] [ab1455e9720] soc-2019-openxr: Fix error in OpenGL version check for OpenXR 1.0

Julian Eisel noreply at git.blender.org
Thu Aug 1 01:56:57 CEST 2019


Commit: ab1455e9720fbcd20707562df0a7943b902555a5
Author: Julian Eisel
Date:   Thu Aug 1 01:56:35 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBab1455e9720fbcd20707562df0a7943b902555a5

Fix error in OpenGL version check for OpenXR 1.0

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

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

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

diff --git a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
index 324e9acdfdf..fc9ec516fdf 100644
--- a/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
+++ b/intern/ghost/intern/GHOST_XrGraphicsBinding.cpp
@@ -73,7 +73,7 @@ class GHOST_XrGraphicsBindingOpenGL : public GHOST_IXrGraphicsBinding {
     GHOST_ContextWGL *ctx_gl = static_cast<GHOST_ContextWGL *>(ghost_ctx);
 #endif
     XrGraphicsRequirementsOpenGLKHR gpu_requirements{XR_TYPE_GRAPHICS_REQUIREMENTS_OPENGL_KHR};
-    const uint32_t gl_version = XR_MAKE_VERSION(
+    const XrVersion gl_version = XR_MAKE_VERSION(
         ctx_gl->m_contextMajorVersion, ctx_gl->m_contextMinorVersion, 0);
 
     xrGetOpenGLGraphicsRequirementsKHR(instance, system_id, &gpu_requirements);
@@ -87,7 +87,7 @@ class GHOST_XrGraphicsBindingOpenGL : public GHOST_IXrGraphicsBinding {
                 << XR_VERSION_MAJOR(gpu_requirements.maxApiVersionSupported) << "."
                 << XR_VERSION_MINOR(gpu_requirements.maxApiVersionSupported) << std::endl;
 
-      *r_requirement_info = std::move(strstream.str());
+      *r_requirement_info = strstream.str();
     }
 
     return (gl_version >= gpu_requirements.minApiVersionSupported) &&
diff --git a/intern/ghost/intern/GHOST_XrSession.cpp b/intern/ghost/intern/GHOST_XrSession.cpp
index 2cfeed3d9a6..dee175632b5 100644
--- a/intern/ghost/intern/GHOST_XrSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cpp
@@ -160,7 +160,7 @@ void GHOST_XrSession::start(const GHOST_XrSessionBeginInfo *begin_info)
   if (!m_gpu_binding->checkVersionRequirements(
           m_gpu_ctx, m_context->getInstance(), m_oxr->system_id, &requirement_str)) {
     std::ostringstream strstream;
-    strstream << "Available graphics context version does not meet the following requirements: %s"
+    strstream << "Available graphics context version does not meet the following requirements: "
               << requirement_str;
     THROW_XR(strstream.str().c_str());
   }



More information about the Bf-blender-cvs mailing list