rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-01 19:29:16 +01:00
Code Issues Projects Releases Wiki Activity

[vr] Refactor compositor initialization

Browse Source
This commit is contained in:
Philip Rebohle 2018-06-30 16:51:20 +02:00
parent bc1384b7b4
commit cf6e3c1fbf
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/dxvk/dxvk_openvr.cpp
View File

@ -34,15 +34,13 @@ namespace dxvk {
void VrInstance::initInstanceExtensions() { void VrInstance::initInstanceExtensions() {
std::lock_guard<std::mutex> lock(m_mutex); std::lock_guard<std::mutex> lock(m_mutex);
if (m_initializedInsExt) if (m_compositor == nullptr)
return; m_compositor = this->getCompositor();
vr::IVRCompositor* compositor = this->getCompositor();
if (compositor == nullptr) if (m_compositor == nullptr || m_initializedInsExt)
return; return;
m_insExtensions = this->queryInstanceExtensions(compositor); m_insExtensions = this->queryInstanceExtensions();
m_initializedInsExt = true; m_initializedInsExt = true;
} }
@ -50,35 +48,33 @@ namespace dxvk {
void VrInstance::initDeviceExtensions(const DxvkInstance* instance) { void VrInstance::initDeviceExtensions(const DxvkInstance* instance) {
std::lock_guard<std::mutex> lock(m_mutex); std::lock_guard<std::mutex> lock(m_mutex);
if (m_initializedDevExt) if (m_compositor == nullptr || m_initializedDevExt)
return;
vr::IVRCompositor* compositor = this->getCompositor();
if (compositor == nullptr)
return; return;
for (uint32_t i = 0; instance->enumAdapters(i) != nullptr; i++) { for (uint32_t i = 0; instance->enumAdapters(i) != nullptr; i++) {
m_devExtensions.push_back(this->queryDeviceExtensions( m_devExtensions.push_back(this->queryDeviceExtensions(
compositor, instance->enumAdapters(i)->handle())); instance->enumAdapters(i)->handle()));
} }
if (m_initializedOpenVr)
/* shutdown */;
m_initializedDevExt = true; m_initializedDevExt = true;
} }
vk::NameSet VrInstance::queryInstanceExtensions(vr::IVRCompositor* compositor) const { vk::NameSet VrInstance::queryInstanceExtensions() const {
uint32_t len = compositor->GetVulkanInstanceExtensionsRequired(nullptr, 0); uint32_t len = m_compositor->GetVulkanInstanceExtensionsRequired(nullptr, 0);
std::vector<char> extensionList(len); std::vector<char> extensionList(len);
len = compositor->GetVulkanInstanceExtensionsRequired(extensionList.data(), len); len = m_compositor->GetVulkanInstanceExtensionsRequired(extensionList.data(), len);
return parseExtensionList(std::string(extensionList.data(), len)); return parseExtensionList(std::string(extensionList.data(), len));
} }
vk::NameSet VrInstance::queryDeviceExtensions(vr::IVRCompositor* compositor, VkPhysicalDevice adapter) const { vk::NameSet VrInstance::queryDeviceExtensions(VkPhysicalDevice adapter) const {
uint32_t len = compositor->GetVulkanDeviceExtensionsRequired(adapter, nullptr, 0); uint32_t len = m_compositor->GetVulkanDeviceExtensionsRequired(adapter, nullptr, 0);
std::vector<char> extensionList(len); std::vector<char> extensionList(len);
len = compositor->GetVulkanDeviceExtensionsRequired(adapter, extensionList.data(), len); len = m_compositor->GetVulkanDeviceExtensionsRequired(adapter, extensionList.data(), len);
return parseExtensionList(std::string(extensionList.data(), len)); return parseExtensionList(std::string(extensionList.data(), len));
} }
@ -128,7 +124,7 @@ namespace dxvk {
return nullptr; return nullptr;
} }
Logger::warn("OpenVR: Compositor interface found"); Logger::info("OpenVR: Compositor interface found");
return compositor; return compositor;
} }

8
src/dxvk/dxvk_openvr.h
View File

@ -63,19 +63,19 @@ namespace dxvk {
private: private:
std::mutex m_mutex; std::mutex m_mutex;
vr::IVRCompositor* m_compositor;
bool m_initializedOpenVr = false;
bool m_initializedInsExt = false; bool m_initializedInsExt = false;
bool m_initializedDevExt = false; bool m_initializedDevExt = false;
vk::NameSet m_insExtensions; vk::NameSet m_insExtensions;
std::vector<vk::NameSet> m_devExtensions; std::vector<vk::NameSet> m_devExtensions;
vk::NameSet queryInstanceExtensions( vk::NameSet queryInstanceExtensions() const;
vr::IVRCompositor* compositor) const;
vk::NameSet queryDeviceExtensions( vk::NameSet queryDeviceExtensions(
vr::IVRCompositor* compositor,
VkPhysicalDevice adapter) const; VkPhysicalDevice adapter) const;
static vk::NameSet parseExtensionList(const std::string& str); static vk::NameSet parseExtensionList(const std::string& str);