Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 00:56:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Re-disable reprojection in OpenVR

Browse source
This commit is contained in:
Brad Davis 2016-08-09 11:58:19 -07:00
parent 82081d7d57
commit ff24bc982c
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/openvr/src/OpenVrDisplayPlugin.cpp
View file

@ -40,11 +40,6 @@ bool _openVrDisplayActive { false };
static vr::VRTextureBounds_t OPENVR_TEXTURE_BOUNDS_LEFT{ 0, 0, 0.5f, 1 }; static vr::VRTextureBounds_t OPENVR_TEXTURE_BOUNDS_LEFT{ 0, 0, 0.5f, 1 };
static vr::VRTextureBounds_t OPENVR_TEXTURE_BOUNDS_RIGHT{ 0.5f, 0, 1, 1 }; static vr::VRTextureBounds_t OPENVR_TEXTURE_BOUNDS_RIGHT{ 0.5f, 0, 1, 1 };
#define OPENVR_THREADED_SUBMIT 1
#if OPENVR_THREADED_SUBMIT #if OPENVR_THREADED_SUBMIT
static QString readFile(const QString& filename) { static QString readFile(const QString& filename) {
@ -326,6 +321,7 @@ void OpenVrDisplayPlugin::customizeContext() {
Parent::customizeContext(); Parent::customizeContext();
#if OPENVR_THREADED_SUBMIT
_compositeInfos[0].texture = _compositeFramebuffer->getRenderBuffer(0); _compositeInfos[0].texture = _compositeFramebuffer->getRenderBuffer(0);
for (size_t i = 0; i < COMPOSITING_BUFFER_SIZE; ++i) { for (size_t i = 0; i < COMPOSITING_BUFFER_SIZE; ++i) {
if (0 != i) { if (0 != i) {
@ -333,8 +329,8 @@ void OpenVrDisplayPlugin::customizeContext() {
} }
_compositeInfos[i].textureID = getGLBackend()->getTextureID(_compositeInfos[i].texture, false); _compositeInfos[i].textureID = getGLBackend()->getTextureID(_compositeInfos[i].texture, false);
} }
_submitThread->start(QThread::HighPriority); _submitThread->start(QThread::HighPriority);
#endif
} }
void OpenVrDisplayPlugin::uncustomizeContext() { void OpenVrDisplayPlugin::uncustomizeContext() {
@ -459,8 +455,8 @@ void OpenVrDisplayPlugin::hmdPresent() {
#if OPENVR_THREADED_SUBMIT #if OPENVR_THREADED_SUBMIT
_submitThread->waitForPresent(); _submitThread->waitForPresent();
#else #else
GLuint glTexId = getGLBackend()->getTextureID(_compositeFramebuffer->getRenderBuffer(0), false);
vr::Texture_t vrTexture{ (void*)glTexId, vr::API_OpenGL, vr::ColorSpace_Auto }; vr::Texture_t vrTexture{ (void*)glTexId, vr::API_OpenGL, vr::ColorSpace_Auto };
vr::VRCompositor()->Submit(vr::Eye_Left, &vrTexture, &OPENVR_TEXTURE_BOUNDS_LEFT); vr::VRCompositor()->Submit(vr::Eye_Left, &vrTexture, &OPENVR_TEXTURE_BOUNDS_LEFT);
vr::VRCompositor()->Submit(vr::Eye_Right, &vrTexture, &OPENVR_TEXTURE_BOUNDS_RIGHT); vr::VRCompositor()->Submit(vr::Eye_Right, &vrTexture, &OPENVR_TEXTURE_BOUNDS_RIGHT);

16
plugins/openvr/src/OpenVrDisplayPlugin.h
View file

@ -15,8 +15,10 @@
const float TARGET_RATE_OpenVr = 90.0f; // FIXME: get from sdk tracked device property? This number is vive-only. const float TARGET_RATE_OpenVr = 90.0f; // FIXME: get from sdk tracked device property? This number is vive-only.
class OpenVrSubmitThread; #define OPENVR_THREADED_SUBMIT 0
#if OPENVR_THREADED_SUBMIT
class OpenVrSubmitThread;
static const size_t COMPOSITING_BUFFER_SIZE = 3; static const size_t COMPOSITING_BUFFER_SIZE = 3;
struct CompositeInfo { struct CompositeInfo {
@ -28,7 +30,7 @@ struct CompositeInfo {
glm::mat4 pose; glm::mat4 pose;
GLsync fence{ 0 }; GLsync fence{ 0 };
}; };
#endif
class OpenVrDisplayPlugin : public HmdDisplayPlugin { class OpenVrDisplayPlugin : public HmdDisplayPlugin {
using Parent = HmdDisplayPlugin; using Parent = HmdDisplayPlugin;
@ -64,16 +66,18 @@ protected:
private: private:
CompositeInfo::Array _compositeInfos;
size_t _renderingIndex { 0 };
vr::IVRSystem* _system { nullptr }; vr::IVRSystem* _system { nullptr };
std::atomic<vr::EDeviceActivityLevel> _hmdActivityLevel { vr::k_EDeviceActivityLevel_Unknown }; std::atomic<vr::EDeviceActivityLevel> _hmdActivityLevel { vr::k_EDeviceActivityLevel_Unknown };
std::atomic<uint32_t> _keyboardSupressionCount{ 0 }; std::atomic<uint32_t> _keyboardSupressionCount{ 0 };
static const QString NAME; static const QString NAME;
vr::HmdMatrix34_t _lastGoodHMDPose; vr::HmdMatrix34_t _lastGoodHMDPose;
std::shared_ptr<OpenVrSubmitThread> _submitThread;
mat4 _sensorResetMat; mat4 _sensorResetMat;
friend class OpenVrSubmitThread;
#if OPENVR_THREADED_SUBMIT
CompositeInfo::Array _compositeInfos;
size_t _renderingIndex { 0 };
std::shared_ptr<OpenVrSubmitThread> _submitThread;
friend class OpenVrSubmitThread;
#endif
}; };