diff options
author | Julian Eisel <julian@blender.org> | 2020-08-14 18:18:09 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-08-14 18:18:09 +0300 |
commit | e8dfe91767bd87c0499de1edbc721ef928e893d7 (patch) | |
tree | ab2d921a6eda9837efc7f9de4cb3abee72985192 /intern/ghost | |
parent | d117520aa28f0d8a86eb6675836261e6426761cf (diff) | |
parent | b3c08a3a0a9b0cd9e66bbf4bdeeedb6c2c5e7c76 (diff) |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'intern/ghost')
-rw-r--r-- | intern/ghost/intern/GHOST_XrContext.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/ghost/intern/GHOST_XrContext.cpp b/intern/ghost/intern/GHOST_XrContext.cpp index 6ccddeff5a6..c5fe3c3c113 100644 --- a/intern/ghost/intern/GHOST_XrContext.cpp +++ b/intern/ghost/intern/GHOST_XrContext.cpp @@ -23,6 +23,7 @@ #include <cassert> #include <sstream> #include <string> +#include <string_view> #include "GHOST_Types.h" #include "GHOST_XrException.h" @@ -348,7 +349,8 @@ static bool openxr_layer_is_available(const std::vector<XrApiLayerProperties> &l } static bool openxr_extension_is_available( - const std::vector<XrExtensionProperties> &extensions_info, const std::string &extension_name) + const std::vector<XrExtensionProperties> &extensions_info, + const std::string_view &extension_name) { for (const XrExtensionProperties &ext_info : extensions_info) { if (ext_info.extensionName == extension_name) { @@ -405,14 +407,12 @@ void GHOST_XrContext::getExtensionsToEnable( const std::vector<GHOST_TXrGraphicsBinding> &graphics_binding_types, std::vector<const char *> &r_ext_names) { - std::vector<std::string> try_ext; + std::vector<std::string_view> try_ext; /* Try enabling debug extension. */ -#ifndef WIN32 if (isDebugMode()) { try_ext.push_back(XR_EXT_DEBUG_UTILS_EXTENSION_NAME); } -#endif r_ext_names.reserve(try_ext.size() + graphics_binding_types.size()); @@ -424,9 +424,9 @@ void GHOST_XrContext::getExtensionsToEnable( r_ext_names.push_back(gpu_binding); } - for (const std::string &ext : try_ext) { + for (const std::string_view &ext : try_ext) { if (openxr_extension_is_available(m_oxr->extensions, ext)) { - r_ext_names.push_back(ext.c_str()); + r_ext_names.push_back(ext.data()); } } } |