4 files changed, 21 insertions, 15 deletions
diff --git a/modules/openxr/extensions/openxr_extension_wrapper.h b/modules/openxr/extensions/openxr_extension_wrapper.h
index f3064041b8..0f7c0ba0bc 100644
--- a/modules/openxr/extensions/openxr_extension_wrapper.h
+++ b/modules/openxr/extensions/openxr_extension_wrapper.h
@@ -33,7 +33,7 @@
 
 #include "core/error/error_macros.h"
 #include "core/math/camera_matrix.h"
-#include "core/templates/map.h"
+#include "core/templates/hash_map.h"
 #include "core/templates/rid.h"
 
 #include "thirdparty/openxr/src/common/xr_linear.h"
@@ -49,10 +49,10 @@ protected:
 	// Store extension we require.
 	// If bool pointer is a nullptr this means this extension is mandatory and initialisation will fail if it is not available
 	// If bool pointer is set, value will be set to true or false depending on whether extension is available
-	Map<const char *, bool *> request_extensions;
+	HashMap<String, bool *> request_extensions;
 
 public:
-	virtual Map<const char *, bool *> get_request_extensions() {
+	virtual HashMap<String, bool *> get_request_extensions() {
 		return request_extensions;
 	}
 
diff --git a/modules/openxr/openxr_api.cpp b/modules/openxr/openxr_api.cpp
index d0f67b7f5d..6e94e3b444 100644
--- a/modules/openxr/openxr_api.cpp
+++ b/modules/openxr/openxr_api.cpp
@@ -170,9 +170,9 @@ bool OpenXRAPI::load_supported_extensions() {
 	return true;
 }
 
-bool OpenXRAPI::is_extension_supported(const char *p_extension) const {
+bool OpenXRAPI::is_extension_supported(const String &p_extension) const {
 	for (uint32_t i = 0; i < num_supported_extensions; i++) {
-		if (strcmp(supported_extensions[i].extensionName, p_extension) == 0) {
+		if ((supported_extensions[i].extensionName == p_extension) == 0) {
 #ifdef DEBUG
 			print_line("OpenXR: requested extension", p_extension, "is supported");
 #endif
@@ -204,9 +204,9 @@ bool OpenXRAPI::create_instance() {
 	// Create our OpenXR instance, this will query any registered extension wrappers for extensions we need to enable.
 
 	// Append the extensions requested by the registered extension wrappers.
-	Map<const char *, bool *> requested_extensions;
+	HashMap<String, bool *> requested_extensions;
 	for (OpenXRExtensionWrapper *wrapper : registered_extension_wrappers) {
-		Map<const char *, bool *> wrapper_request_extensions = wrapper->get_request_extensions();
+		const HashMap<String, bool *> &wrapper_request_extensions = wrapper->get_request_extensions();
 
 		// requested_extensions.insert(wrapper_request_extensions.begin(), wrapper_request_extensions.end());
 		for (auto &requested_extension : wrapper_request_extensions) {
@@ -224,6 +224,7 @@ bool OpenXRAPI::create_instance() {
 
 	// Check which extensions are supported
 	enabled_extensions.clear();
+
 	for (auto &requested_extension : requested_extensions) {
 		if (!is_extension_supported(requested_extension.key)) {
 			if (requested_extension.value == nullptr) {
@@ -238,13 +239,18 @@ bool OpenXRAPI::create_instance() {
 			*requested_extension.value = true;
 
 			// and record that we want to enable it
-			enabled_extensions.push_back(requested_extension.key);
+			enabled_extensions.push_back(requested_extension.key.ascii());
 		} else {
 			// record that we want to enable this
-			enabled_extensions.push_back(requested_extension.key);
+			enabled_extensions.push_back(requested_extension.key.ascii());
 		}
 	}
 
+	Vector<const char *> extension_ptrs;
+	for (int i = 0; i < enabled_extensions.size(); i++) {
+		extension_ptrs.push_back(enabled_extensions[i].get_data());
+	}
+
 	// Get our project name
 	String project_name = GLOBAL_GET("application/config/name");
 
@@ -264,8 +270,8 @@ bool OpenXRAPI::create_instance() {
 		application_info, // applicationInfo
 		0, // enabledApiLayerCount, need to find out if we need support for this?
 		nullptr, // enabledApiLayerNames
-		uint32_t(enabled_extensions.size()), // enabledExtensionCount
-		enabled_extensions.ptr() // enabledExtensionNames
+		uint32_t(extension_ptrs.size()), // enabledExtensionCount
+		extension_ptrs.ptr() // enabledExtensionNames
 	};
 
 	copy_string_to_char_buffer(project_name, instance_create_info.applicationInfo.applicationName, XR_MAX_APPLICATION_NAME_SIZE);
diff --git a/modules/openxr/openxr_api.h b/modules/openxr/openxr_api.h
index 702f6b9b1d..bd71f0e1c2 100644
--- a/modules/openxr/openxr_api.h
+++ b/modules/openxr/openxr_api.h
@@ -37,7 +37,7 @@
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
 #include "core/string/ustring.h"
-#include "core/templates/map.h"
+#include "core/templates/rb_map.h"
 #include "core/templates/rid_owner.h"
 #include "core/templates/vector.h"
 #include "servers/xr/xr_pose.h"
@@ -73,7 +73,7 @@ private:
 	uint32_t num_supported_extensions = 0;
 	XrExtensionProperties *supported_extensions = nullptr;
 	Vector<OpenXRExtensionWrapper *> registered_extension_wrappers;
-	Vector<const char *> enabled_extensions;
+	Vector<CharString> enabled_extensions;
 
 	bool ext_hp_mixed_reality_available = false;
 	bool ext_samsung_odyssey_available = false;
@@ -132,7 +132,7 @@ private:
 
 	bool load_layer_properties();
 	bool load_supported_extensions();
-	bool is_extension_supported(const char *p_extension) const;
+	bool is_extension_supported(const String &p_extension) const;
 
 	// instance
 	bool create_instance();
diff --git a/modules/openxr/openxr_interface.cpp b/modules/openxr/openxr_interface.cpp
index 41ce8c019e..ab06583932 100644
--- a/modules/openxr/openxr_interface.cpp
+++ b/modules/openxr/openxr_interface.cpp
@@ -113,7 +113,7 @@ void OpenXRInterface::_load_action_map() {
 
 	// process our action map
 	if (action_map.is_valid()) {
-		Map<Ref<OpenXRAction>, Action *> xr_actions;
+		HashMap<Ref<OpenXRAction>, Action *> xr_actions;
 
 		Array action_sets = action_map->get_action_sets();
 		for (int i = 0; i < action_sets.size(); i++) {