Skip to content

Enable OpenVR flat screen submissions #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mutars wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable OpenVR flat screen submissions #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/ModSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
#include "ModSettings.h"

#include "mods/VR.hpp"

namespace ModSettings {
InternalSettings g_internalSettings;

bool showFlatScreenDisplay()
{
static auto vr = VR::get();
//TODO fix for openvr
if (vr->is_hmd_active() && vr->get_runtime()->is_openvr()) {
return false;
}
return g_internalSettings.forceFlatScreen || g_internalSettings.showQuadDisplay;
}
}
150 changes: 110 additions & 40 deletions src/mods/vr/D3D11Component.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ vr::EVRCompositorError D3D11Component::on_frame(VR* vr) {
auto runtime = vr->get_runtime();
bool is_left_eye_frame = vr->m_presenter_frame_count % 2 == vr->m_left_eye_interval;
bool is_right_eye_frame = !is_left_eye_frame;
bool flat_openvr = runtime->is_openvr() && ModSettings::showFlatScreenDisplay();

// Duplicate frames can sometimes cause the UI to get stuck on the screen.
// and can lock up the compositor.
Expand Down Expand Up @@ -302,33 +303,66 @@ vr::EVRCompositorError D3D11Component::on_frame(VR* vr) {
}

if (runtime->is_openvr()) {
vr::VRTextureWithPose_t left_eye{};
left_eye.handle = (void*)m_left_eye_tex.Get();
left_eye.eType = vr::TextureType_DirectX;
left_eye.eColorSpace = vr::ColorSpace_Auto;
left_eye.mDeviceToAbsoluteTracking = GlobalPool::get_openvr_pose(vr->m_presenter_frame_count);

auto e = vr::VRCompositor()->Submit(vr::Eye_Left, (vr::Texture_t*)&left_eye, &vr->m_left_bounds, vr::Submit_TextureWithPose);

if (e != vr::VRCompositorError_None) {
spdlog::error("[VR] VRCompositor failed to submit left eye: {}", (int)e);
vr->m_submitted = false;
return e;
}
if (flat_openvr) {
context->CopyResource(m_right_eye_tex.Get(), m_left_eye_tex.Get());

vr::VRTextureWithPose_t left_eye{};
left_eye.handle = (void*)m_left_eye_tex.Get();
left_eye.eType = vr::TextureType_DirectX;
left_eye.eColorSpace = vr::ColorSpace_Auto;
left_eye.mDeviceToAbsoluteTracking = GlobalPool::get_openvr_pose(vr->m_presenter_frame_count);

if (vr->is_using_async_aer()) {
vr::VRTextureWithPose_t right_eye{};
right_eye.handle = (void*)m_right_eye_tex.Get();
right_eye.eType = vr::TextureType_DirectX;
right_eye.eColorSpace = vr::ColorSpace_Auto;
right_eye.mDeviceToAbsoluteTracking = GlobalPool::get_openvr_pose(vr->m_presenter_frame_count - 1);
right_eye.mDeviceToAbsoluteTracking = GlobalPool::get_openvr_pose(vr->m_presenter_frame_count);

e = vr::VRCompositor()->Submit(vr::Eye_Right, (vr::Texture_t*)&right_eye, &vr->m_right_bounds, vr::Submit_TextureWithPose);
auto e = vr::VRCompositor()->Submit(vr::Eye_Left, (vr::Texture_t*)&left_eye, &vr->m_left_bounds, vr::Submit_TextureWithPose);

if (e != vr::VRCompositorError_None) {
spdlog::error("[VR] VRCompositor failed to submit right eye (resubmit): {}", (int)e);
spdlog::error("[VR] VRCompositor failed to submit left eye: {}", (int)e);
vr->m_submitted = false;
return e;
}

e = vr::VRCompositor()->Submit(vr::Eye_Right, (vr::Texture_t*)&right_eye, &vr->m_right_bounds, vr::Submit_TextureWithPose);
if (e != vr::VRCompositorError_None) {
spdlog::error("[VR] VRCompositor failed to submit right eye: {}", (int)e);
vr->m_submitted = false;
return e;
}

vr->m_submitted = true;
} else {
vr::VRTextureWithPose_t left_eye{};
left_eye.handle = (void*)m_left_eye_tex.Get();
left_eye.eType = vr::TextureType_DirectX;
left_eye.eColorSpace = vr::ColorSpace_Auto;
left_eye.mDeviceToAbsoluteTracking = GlobalPool::get_openvr_pose(vr->m_presenter_frame_count);

auto e = vr::VRCompositor()->Submit(vr::Eye_Left, (vr::Texture_t*)&left_eye, &vr->m_left_bounds, vr::Submit_TextureWithPose);

if (e != vr::VRCompositorError_None) {
spdlog::error("[VR] VRCompositor failed to submit left eye: {}", (int)e);
vr->m_submitted = false;
return e;
}

if (vr->is_using_async_aer()) {
vr::VRTextureWithPose_t right_eye{};
right_eye.handle = (void*)m_right_eye_tex.Get();
right_eye.eType = vr::TextureType_DirectX;
right_eye.eColorSpace = vr::ColorSpace_Auto;
right_eye.mDeviceToAbsoluteTracking = GlobalPool::get_openvr_pose(vr->m_presenter_frame_count - 1);

e = vr::VRCompositor()->Submit(vr::Eye_Right, (vr::Texture_t*)&right_eye, &vr->m_right_bounds, vr::Submit_TextureWithPose);

if (e != vr::VRCompositorError_None) {
spdlog::error("[VR] VRCompositor failed to submit right eye (resubmit): {}", (int)e);
}
vr->m_submitted = true;
}
}
}
} else {
Expand Down Expand Up @@ -368,39 +402,75 @@ vr::EVRCompositorError D3D11Component::on_frame(VR* vr) {
}

if (runtime->is_openvr()) {
if (vr->is_using_async_aer()) {
if (flat_openvr) {
if (backbufferIs8Bit) {
context->CopyResource(m_right_eye_tex.Get(), backbuffer.Get());
}
context->CopyResource(m_left_eye_tex.Get(), m_right_eye_tex.Get());

vr::VRTextureWithPose_t left_eye{};
left_eye.handle = (void*)m_left_eye_tex.Get();
left_eye.eType = vr::TextureType_DirectX;
left_eye.eColorSpace = vr::ColorSpace_Auto;
left_eye.mDeviceToAbsoluteTracking = GlobalPool::get_openvr_pose(vr->m_presenter_frame_count - 1);
left_eye.mDeviceToAbsoluteTracking = GlobalPool::get_openvr_pose(vr->m_presenter_frame_count);

vr::VRTextureWithPose_t right_eye{};
right_eye.handle = (void*)m_right_eye_tex.Get();
right_eye.eType = vr::TextureType_DirectX;
right_eye.eColorSpace = vr::ColorSpace_Auto;
right_eye.mDeviceToAbsoluteTracking = GlobalPool::get_openvr_pose(vr->m_presenter_frame_count);

auto e = vr::VRCompositor()->Submit(vr::Eye_Left, (vr::Texture_t*)&left_eye, &vr->m_left_bounds, vr::Submit_TextureWithPose);

if (e != vr::VRCompositorError_None) {
spdlog::error("[VR] VRCompositor failed to submit left eye (resubmit): {}", (int)e);
spdlog::error("[VR] VRCompositor failed to submit left eye: {}", (int)e);
vr->m_submitted = false;
return e;
}
}
// Copy the back buffer to the right eye texture.
if (backbufferIs8Bit) {
context->CopyResource(m_right_eye_tex.Get(), backbuffer.Get());
}

vr::VRTextureWithPose_t right_eye{};
right_eye.handle = (void*)m_right_eye_tex.Get();
right_eye.eType = vr::TextureType_DirectX;
right_eye.eColorSpace = vr::ColorSpace_Auto;
right_eye.mDeviceToAbsoluteTracking = GlobalPool::get_openvr_pose(vr->m_presenter_frame_count);

auto e = vr::VRCompositor()->Submit(vr::Eye_Right, (vr::Texture_t*)&right_eye, &vr->m_right_bounds, vr::Submit_TextureWithPose);

if (e != vr::VRCompositorError_None) {
spdlog::error("[VR] VRCompositor failed to submit right eye: {}", (int)e);
vr->m_submitted = false;
return e;
}

vr->m_submitted = true;
e = vr::VRCompositor()->Submit(vr::Eye_Right, (vr::Texture_t*)&right_eye, &vr->m_right_bounds, vr::Submit_TextureWithPose);
if (e != vr::VRCompositorError_None) {
spdlog::error("[VR] VRCompositor failed to submit right eye: {}", (int)e);
vr->m_submitted = false;
return e;
}

vr->m_submitted = true;
} else {
if (vr->is_using_async_aer()) {
vr::VRTextureWithPose_t left_eye{};
left_eye.handle = (void*)m_left_eye_tex.Get();
left_eye.eType = vr::TextureType_DirectX;
left_eye.eColorSpace = vr::ColorSpace_Auto;
left_eye.mDeviceToAbsoluteTracking = GlobalPool::get_openvr_pose(vr->m_presenter_frame_count - 1);

auto e = vr::VRCompositor()->Submit(vr::Eye_Left, (vr::Texture_t*)&left_eye, &vr->m_left_bounds, vr::Submit_TextureWithPose);

if (e != vr::VRCompositorError_None) {
spdlog::error("[VR] VRCompositor failed to submit left eye (resubmit): {}", (int)e);
}
}
// Copy the back buffer to the right eye texture.
if (backbufferIs8Bit) {
context->CopyResource(m_right_eye_tex.Get(), backbuffer.Get());
}

vr::VRTextureWithPose_t right_eye{};
right_eye.handle = (void*)m_right_eye_tex.Get();
right_eye.eType = vr::TextureType_DirectX;
right_eye.eColorSpace = vr::ColorSpace_Auto;
right_eye.mDeviceToAbsoluteTracking = GlobalPool::get_openvr_pose(vr->m_presenter_frame_count);

auto e = vr::VRCompositor()->Submit(vr::Eye_Right, (vr::Texture_t*)&right_eye, &vr->m_right_bounds, vr::Submit_TextureWithPose);

if (e != vr::VRCompositorError_None) {
spdlog::error("[VR] VRCompositor failed to submit right eye: {}", (int)e);
vr->m_submitted = false;
return e;
}

vr->m_submitted = true;
}
}

}
Expand Down
Loading