Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-14 14:46:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disabling OpenVR plugin

Browse source
This commit is contained in:
Bradley Austin Davis 2015-12-08 17:55:46 -08:00
parent 978d39b7f4
commit fd5fb3096f
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -105,7 +105,7 @@ public:
// take the latest texture and present it
_context->makeCurrent();
if (QOpenGLContext::currentContext() == _context->contextHandle()) {
_activePlugin->present();
currentPlugin->present();
_context->doneCurrent();
} else {
qWarning() << "Makecurrent failed";

8
plugins/openvr/CMakeLists.txt
View file

@ -6,7 +6,10 @@
# See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html
#
if (WIN32)
# OpenVR is disabled until a) it works with threaded present and
# b) it doesn't interfere with Oculus SDK 0.8
if (FALSE)
#if (WIN32)
# we're using static GLEW, so define GLEW_STATIC
add_definitions(-DGLEW_STATIC)
set(TARGET_NAME openvr)
@ -21,5 +24,4 @@ if (WIN32)
find_package(OpenVR REQUIRED)
target_include_directories(${TARGET_NAME} PRIVATE ${OPENVR_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES})
endif()
endif()