Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-06 13:32:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #15116 from jherico/fix/oculus_sdk_update

Browse source 
Case 21595: Oculus SDK Update
This commit is contained in:
Bradley Austin Davis 2019-03-08 23:53:06 -08:00 committed by GitHub
commit 0e46007d84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
View file

@ -117,7 +117,8 @@ void RenderThread::setup() {
{ std::unique_lock<std::mutex> lock(_frameLock); } { std::unique_lock<std::mutex> lock(_frameLock); }
ovr::VrHandler::initVr(); ovr::VrHandler::initVr();
ovr::VrHandler::setHandler(this); // Enable KHR_no_error for this context
ovr::VrHandler::setHandler(this, true);
makeCurrent(); makeCurrent();

2
cmake/macros/TargetOculusMobile.cmake
View file

@ -1,6 +1,6 @@
macro(target_oculus_mobile) macro(target_oculus_mobile)
set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/oculus/VrApi) set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/oculus_1.22/VrApi)
# Mobile SDK # Mobile SDK
set(OVR_MOBILE_INCLUDE_DIRS ${INSTALL_DIR}/Include) set(OVR_MOBILE_INCLUDE_DIRS ${INSTALL_DIR}/Include)

8
hifi_android.py
View file

@ -45,10 +45,10 @@ ANDROID_PACKAGES = {
'sharedLibFolder': 'lib', 'sharedLibFolder': 'lib',
'includeLibs': ['libnvtt.so', 'libnvmath.so', 'libnvimage.so', 'libnvcore.so'] 'includeLibs': ['libnvtt.so', 'libnvmath.so', 'libnvimage.so', 'libnvcore.so']
}, },
'oculus': { 'oculus_1.22': {
'file': 'ovr_sdk_mobile_1.19.0.zip', 'file': 'ovr_sdk_mobile_1.22.zip',
'versionId': 's_RN1vlEvUi3pnT7WPxUC4pQ0RJBs27y', 'versionId': 'InhomR5gwkzyiLAelH3X9k4nvV3iIpA_',
'checksum': '98f0afb62861f1f02dd8110b31ed30eb', 'checksum': '1ac3c5b0521e5406f287f351015daff8',
'sharedLibFolder': 'VrApi/Libs/Android/arm64-v8a/Release', 'sharedLibFolder': 'VrApi/Libs/Android/arm64-v8a/Release',
'includeLibs': ['libvrapi.so'] 'includeLibs': ['libvrapi.so']
}, },

11
libraries/oculusMobile/src/ovr/GLContext.cpp
View file

@ -13,10 +13,7 @@
#include <mutex> #include <mutex>
#include <android/log.h> #include <android/log.h>
#include <EGL/eglext.h>
#if !defined(EGL_OPENGL_ES3_BIT_KHR)
#define EGL_OPENGL_ES3_BIT_KHR 0x0040
#endif
using namespace ovr; using namespace ovr;
@ -129,7 +126,7 @@ void GLContext::doneCurrent() {
eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
} }
bool GLContext::create(EGLDisplay display, EGLContext shareContext) { bool GLContext::create(EGLDisplay display, EGLContext shareContext, bool noError) {
this->display = display; this->display = display;
auto config = findConfig(display); auto config = findConfig(display);
@ -139,7 +136,9 @@ bool GLContext::create(EGLDisplay display, EGLContext shareContext) {
return false; return false;
} }
EGLint contextAttribs[] = { EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE }; EGLint contextAttribs[] = { EGL_CONTEXT_CLIENT_VERSION, 3,
noError ? EGL_CONTEXT_OPENGL_NO_ERROR_KHR : EGL_NONE, EGL_TRUE,
EGL_NONE };
context = eglCreateContext(display, config, shareContext, contextAttribs); context = eglCreateContext(display, config, shareContext, contextAttribs);
if (context == EGL_NO_CONTEXT) { if (context == EGL_NO_CONTEXT) {

2
libraries/oculusMobile/src/ovr/GLContext.h
View file

@ -25,7 +25,7 @@ struct GLContext {
static EGLConfig findConfig(EGLDisplay display); static EGLConfig findConfig(EGLDisplay display);
bool makeCurrent(); bool makeCurrent();
void doneCurrent(); void doneCurrent();
bool create(EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY), EGLContext shareContext = EGL_NO_CONTEXT); bool create(EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY), EGLContext shareContext = EGL_NO_CONTEXT, bool noError = false);
void destroy(); void destroy();
operator bool() const { return context != EGL_NO_CONTEXT; } operator bool() const { return context != EGL_NO_CONTEXT; }
static void initModule(); static void initModule();

25
libraries/oculusMobile/src/ovr/VrHandler.cpp
View file

@ -42,6 +42,8 @@ struct VrSurface : public TaskQueue {
uint32_t readFbo{0}; uint32_t readFbo{0};
std::atomic<uint32_t> presentIndex{1}; std::atomic<uint32_t> presentIndex{1};
double displayTime{0}; double displayTime{0};
// Not currently set by anything
bool noErrorContext { false };
static constexpr float EYE_BUFFER_SCALE = 1.0f; static constexpr float EYE_BUFFER_SCALE = 1.0f;
@ -71,7 +73,7 @@ struct VrSurface : public TaskQueue {
EGLContext currentContext = eglGetCurrentContext(); EGLContext currentContext = eglGetCurrentContext();
EGLDisplay currentDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY); EGLDisplay currentDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
vrglContext.create(currentDisplay, currentContext); vrglContext.create(currentDisplay, currentContext, noErrorContext);
vrglContext.makeCurrent(); vrglContext.makeCurrent();
glm::uvec2 eyeTargetSize; glm::uvec2 eyeTargetSize;
@ -91,14 +93,17 @@ struct VrSurface : public TaskQueue {
} }
void shutdown() { void shutdown() {
noErrorContext = false;
// Destroy the context?
} }
void setHandler(VrHandler *newHandler) { void setHandler(VrHandler *newHandler, bool noError) {
withLock([&] { withLock([&] {
isRenderThread = newHandler != nullptr; isRenderThread = newHandler != nullptr;
if (handler != newHandler) { if (handler != newHandler) {
shutdown(); shutdown();
handler = newHandler; handler = newHandler;
noErrorContext = noError;
init(); init();
if (handler) { if (handler) {
updateVrMode(); updateVrMode();
@ -142,7 +147,6 @@ struct VrSurface : public TaskQueue {
__android_log_write(ANDROID_LOG_WARN, "QQQ_OVR", "vrapi_LeaveVrMode"); __android_log_write(ANDROID_LOG_WARN, "QQQ_OVR", "vrapi_LeaveVrMode");
vrapi_SetClockLevels(session, 1, 1); vrapi_SetClockLevels(session, 1, 1);
vrapi_SetExtraLatencyMode(session, VRAPI_EXTRA_LATENCY_MODE_OFF); vrapi_SetExtraLatencyMode(session, VRAPI_EXTRA_LATENCY_MODE_OFF);
vrapi_SetDisplayRefreshRate(session, 60);
vrapi_LeaveVrMode(session); vrapi_LeaveVrMode(session);
session = nullptr; session = nullptr;
@ -153,16 +157,19 @@ struct VrSurface : public TaskQueue {
ovrJava java{ vm, env, oculusActivity }; ovrJava java{ vm, env, oculusActivity };
ovrModeParms modeParms = vrapi_DefaultModeParms(&java); ovrModeParms modeParms = vrapi_DefaultModeParms(&java);
modeParms.Flags |= VRAPI_MODE_FLAG_NATIVE_WINDOW; modeParms.Flags |= VRAPI_MODE_FLAG_NATIVE_WINDOW;
if (noErrorContext) {
modeParms.Flags |= VRAPI_MODE_FLAG_CREATE_CONTEXT_NO_ERROR;
}
modeParms.Display = (unsigned long long) vrglContext.display; modeParms.Display = (unsigned long long) vrglContext.display;
modeParms.ShareContext = (unsigned long long) vrglContext.context; modeParms.ShareContext = (unsigned long long) vrglContext.context;
modeParms.WindowSurface = (unsigned long long) nativeWindow; modeParms.WindowSurface = (unsigned long long) nativeWindow;
session = vrapi_EnterVrMode(&modeParms); session = vrapi_EnterVrMode(&modeParms);
ovrPosef trackingTransform = vrapi_GetTrackingTransform( session, VRAPI_TRACKING_TRANSFORM_SYSTEM_CENTER_EYE_LEVEL); vrapi_SetTrackingSpace( session, VRAPI_TRACKING_SPACE_LOCAL);
vrapi_SetTrackingTransform( session, trackingTransform ); vrapi_SetPerfThread(session, VRAPI_PERF_THREAD_TYPE_RENDERER, gettid());
vrapi_SetPerfThread(session, VRAPI_PERF_THREAD_TYPE_RENDERER, pthread_self());
vrapi_SetClockLevels(session, 2, 4); vrapi_SetClockLevels(session, 2, 4);
vrapi_SetExtraLatencyMode(session, VRAPI_EXTRA_LATENCY_MODE_DYNAMIC); vrapi_SetExtraLatencyMode(session, VRAPI_EXTRA_LATENCY_MODE_DYNAMIC);
vrapi_SetDisplayRefreshRate(session, 72); // Generates a warning on the quest: "vrapi_SetDisplayRefreshRate: Dynamic Display Refresh Rate not supported"
// vrapi_SetDisplayRefreshRate(session, 72);
}); });
} }
} }
@ -227,8 +234,8 @@ bool VrHandler::vrActive() const {
return SURFACE.session != nullptr; return SURFACE.session != nullptr;
} }
void VrHandler::setHandler(VrHandler* handler) { void VrHandler::setHandler(VrHandler* handler, bool noError) {
SURFACE.setHandler(handler); SURFACE.setHandler(handler, noError);
} }
void VrHandler::pollTask() { void VrHandler::pollTask() {

2
libraries/oculusMobile/src/ovr/VrHandler.h
View file

@ -21,7 +21,7 @@ public:
using HandlerTask = std::function<void(VrHandler*)>; using HandlerTask = std::function<void(VrHandler*)>;
using OvrMobileTask = std::function<void(ovrMobile*)>; using OvrMobileTask = std::function<void(ovrMobile*)>;
using OvrJavaTask = std::function<void(const ovrJava*)>; using OvrJavaTask = std::function<void(const ovrJava*)>;
static void setHandler(VrHandler* handler); static void setHandler(VrHandler* handler, bool noError = false);
static bool withOvrMobile(const OvrMobileTask& task); static bool withOvrMobile(const OvrMobileTask& task);
protected: protected: