Bug 1116: Oculus SDK 0.4.4 support for JOGL - Part-3: New set of C-files, adapt to new SDK API

- Tested on Windows and working StereoDemo01 w/ DK2!

3 files changed, 17 insertions, 5 deletions

diff --git a/make/config/oculusvr/oculusvr-common.cfg b/make/config/oculusvr/oculusvr-common.cfg
index c330ce5be..86d0ce745 100644
--- a/make/config/oculusvr/oculusvr-common.cfg
+++ b/make/config/oculusvr/oculusvr-common.cfg
@@ -17,14 +17,23 @@ RuntimeExceptionType OVRException
 # Mappings for data types
 Opaque boolean ovrBool
 
-# Not implemented in SDK !?
-Ignore ovrHmd_ProcessLatencyTest
-
 # Not native sized: CType['uintptr_t *', size [fixed false, lnx64 64], [array*1]]
 Ignore ovrRenderAPIConfig.PlatformData
 # Not native sized: CType['uintptr_t *', size [fixed false, lnx64 64], [array*1]]
 Ignore ovrTexture.PlatformData
 
+# We use the SDK in headless mode:
+#    #define HEADLESS_APP 1
+# implying: ovrHmdCap_ExtendDesktop
+#
+Ignore ovr_InitializeRenderingShim
+Ignore ovrHmd_RegisterPostDistortionCallback
+Ignore ovrHmd_AttachToWindow
+# HSW = Health and Safety Warning
+Ignore ovrHSWDisplayState
+Ignore ovrHmd_GetHSWDisplayState
+Ignore ovrHmd_DismissHSWDisplay
+
 # These routines use or return strings
 ReturnsString ovrHmd_GetLastError
 ReturnsString ovrHmd_GetLatencyTestResult
@@ -39,8 +48,8 @@ ReturnedArrayLength ovrHmdDesc.Handle 1
 ReturnedArrayLength ovrDistortionMesh.pVertexData getVertexCount()
 ReturnedArrayLength ovrDistortionMesh.pIndexData getIndexCount()
 
-ReturnValueCapacity ovrHmd_Create sizeof(ovrHmd)
-ReturnValueCapacity ovrHmd_CreateDebug sizeof(ovrHmd)
+ReturnValueCapacity ovrHmd_Create sizeof(ovrHmdDesc)
+ReturnValueCapacity ovrHmd_CreateDebug sizeof(ovrHmdDesc)
 
 JavaPrologue ovr_Initialize if( !isAvailable() ) { return false; }
 JavaPrologue ovrHmd_Create if( !isAvailable() ) { return null; }
diff --git a/make/config/oculusvr/oculusvr.c b/make/config/oculusvr/oculusvr.c
index bab34e5a9..35f86eb78 100644
--- a/make/config/oculusvr/oculusvr.c
+++ b/make/config/oculusvr/oculusvr.c
@@ -1,4 +1,6 @@
 
+#define HEADLESS_APP 1
+
 typedef struct ovrHmdStruct {
 } OvrHmdContext;
 
diff --git a/make/config/oculusvr/oculusvr.cfg b/make/config/oculusvr/oculusvr.cfg
index 11e1ee78b..d2d446f21 100644
--- a/make/config/oculusvr/oculusvr.cfg
+++ b/make/config/oculusvr/oculusvr.cfg
@@ -12,6 +12,7 @@ IncludeAs CustomJavaCode OVR oculusvr-ovr-CustomJavaCode.java
 ManualStaticInitCall OVR
 
 # Provide #includes to native code
+CustomCCode #define HEADLESS_APP 1
 CustomCCode typedef struct ovrHmdStruct {
 CustomCCode } OvrHmdContext;
 CustomCCode #include <OVR_CAPI.h>