diff options
author | Sven Gothel <[email protected]> | 2015-03-27 14:25:07 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2015-03-27 14:25:07 +0100 |
commit | d09a50bdc7aca2d441fe7c595711a44fe9dc4a23 (patch) | |
tree | 54c676d1dd10c8afdb48018e6d5cdc5b4d24835c /src/jogl/classes/com/jogamp/opengl | |
parent | 3b7a8f5f4e89adf84fd871c1440859ed3d89802e (diff) |
Bug 1116: Oculus SDK 0.4.4: Add extra DK1 detection; Add call to ovr_Shutdown() and ovrHmd_Destroy(hmdDesc).
Add extra DK1 detection
- SDK 0.4.4 w/ DK1 (Linux): ovrHmd_Detect() returns zero!
- In such case: Try creating one device, which works for DK1 on Linux
Add call to ovr_Shutdown() and ovrHmd_Destroy(hmdDesc).
- Add StereoDeviceFactory.shutdown() and call
ovr_Shutdown() for in OVRStereoDeviceFactory.shutdown().
- Call ovrHmd_Destroy(hmdDesc) in OVRStereoDevice.dispose().
Diffstat (limited to 'src/jogl/classes/com/jogamp/opengl')
-rw-r--r-- | src/jogl/classes/com/jogamp/opengl/util/stereo/StereoDeviceFactory.java | 5 | ||||
-rw-r--r-- | src/jogl/classes/com/jogamp/opengl/util/stereo/generic/GenericStereoDeviceFactory.java | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/stereo/StereoDeviceFactory.java b/src/jogl/classes/com/jogamp/opengl/util/stereo/StereoDeviceFactory.java index 13aa2e891..3847b7d3e 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/stereo/StereoDeviceFactory.java +++ b/src/jogl/classes/com/jogamp/opengl/util/stereo/StereoDeviceFactory.java @@ -107,4 +107,9 @@ public abstract class StereoDeviceFactory { * @return */ public abstract StereoDevice createDevice(final int deviceIndex, final StereoDeviceConfig config, final boolean verbose); + + /** + * Shutdown factory + */ + public abstract void shutdown(); } diff --git a/src/jogl/classes/com/jogamp/opengl/util/stereo/generic/GenericStereoDeviceFactory.java b/src/jogl/classes/com/jogamp/opengl/util/stereo/generic/GenericStereoDeviceFactory.java index 1d5000c97..9c28c0767 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/stereo/generic/GenericStereoDeviceFactory.java +++ b/src/jogl/classes/com/jogamp/opengl/util/stereo/generic/GenericStereoDeviceFactory.java @@ -190,4 +190,9 @@ public class GenericStereoDeviceFactory extends StereoDeviceFactory { public final StereoDevice createDevice(final int deviceIndex, final StereoDeviceConfig config, final boolean verbose) { return new GenericStereoDevice(this, deviceIndex, config); } + + @Override + public void shutdown() { + // NOP + } } |