Bug 1116 - Add OculusVR DK2 Support - Part-1 (DK2 on DK1 SDK w/o Eye Tracker)

- DK2's screen on X11 (at least) starts in rotated mode,
  detect and apply MonitorDevice rotation via NEWT's OpenGL StereoDeviceUtil

- Move StereoDevice.Config -> StereoDeviceConfig

- Expose generic StereoDevice to public: GenericStereoDeviceConfig + GenericStereoDeviceFactory

- GenericStereoDeviceFactory exposes public GenericStereoDeviceConfig creation
  for mono, sbs-stereo and lense-sbs-stereo w/ diff. parameters.

- Pass eye surface/texture size for each eye from device to renderer,
  instead of assuming unified values.

- Unify GenericStereoDevice.createRenderer(..) and OVRStereoDevice.createRenderer(..) code

3 files changed, 83 insertions, 43 deletions

diff --git a/src/oculusvr/classes/jogamp/opengl/oculusvr/OVRStereoDevice.java b/src/oculusvr/classes/jogamp/opengl/oculusvr/OVRStereoDevice.java
index d0d9f5a85..3dadb94b0 100644
--- a/src/oculusvr/classes/jogamp/opengl/oculusvr/OVRStereoDevice.java
+++ b/src/oculusvr/classes/jogamp/opengl/oculusvr/OVRStereoDevice.java
@@ -32,7 +32,6 @@ import com.jogamp.nativewindow.util.DimensionImmutable;
 import com.jogamp.nativewindow.util.PointImmutable;
 import com.jogamp.nativewindow.util.Rectangle;
 import com.jogamp.nativewindow.util.RectangleImmutable;
-
 import com.jogamp.oculusvr.OVR;
 import com.jogamp.oculusvr.OvrHmdContext;
 import com.jogamp.oculusvr.ovrEyeRenderDesc;
@@ -59,6 +58,12 @@ public class OVRStereoDevice implements StereoDevice {
     private final int[] eyeRenderOrder;
     private final int supportedDistortionBits, recommendedDistortionBits, minimumDistortionBits;
 
+    private final String deviceName;
+    private final DimensionImmutable resolution;
+    private final int requiredRotation;
+    private final PointImmutable position;
+    private final int dkVersion;
+
     public OVRStereoDevice(final StereoDeviceFactory factory, final OvrHmdContext nativeContext, final int deviceIndex) {
         if( null == nativeContext ) {
             throw new IllegalArgumentException("Passed null nativeContext");
@@ -68,16 +73,30 @@ public class OVRStereoDevice implements StereoDevice {
         this.deviceIndex = deviceIndex;
         this.hmdDesc = ovrHmdDesc.create();
         OVR.ovrHmd_GetDesc(handle, hmdDesc);
-        final ovrFovPort[] defaultOVREyeFov = hmdDesc.getDefaultEyeFov(0, new ovrFovPort[hmdDesc.getEyeRenderOrderArrayLength()]);
+        final ovrFovPort[] defaultOVREyeFov = hmdDesc.getDefaultEyeFov(0, new ovrFovPort[ovrHmdDesc.getEyeRenderOrderArrayLength()]);
         defaultEyeFov = new FovHVHalves[defaultOVREyeFov.length];
         for(int i=0; i<defaultEyeFov.length; i++) {
             defaultEyeFov[i] = OVRUtil.getFovHV(defaultOVREyeFov[i]);
         }
-        eyeRenderOrder = new int[hmdDesc.getEyeRenderOrderArrayLength()];
+        eyeRenderOrder = new int[ovrHmdDesc.getEyeRenderOrderArrayLength()];
         hmdDesc.getEyeRenderOrder(0, eyeRenderOrder);
         supportedDistortionBits = OVRUtil.ovrDistCaps2DistBits(hmdDesc.getDistortionCaps());
         recommendedDistortionBits = supportedDistortionBits & ~StereoDeviceRenderer.DISTORTION_TIMEWARP;
         minimumDistortionBits = StereoDeviceRenderer.DISTORTION_BARREL;
+
+        // DK1 delivers unrotated resolution in target orientation
+        // DK2 delivers rotated resolution in target orientation, monitor screen is rotated 90deg clockwise
+        deviceName = hmdDesc.getDisplayDeviceNameAsString();
+        final ovrSizei res = hmdDesc.getResolution();
+        resolution = new Dimension(res.getW(), res.getH());
+        if( "OVR0002".equals(deviceName) || "OVR0003".equals(deviceName) ) {
+            dkVersion = 2;
+            requiredRotation = 90;
+        } else {
+            dkVersion = 1;
+            requiredRotation = 0;
+        }
+        position = OVRUtil.getVec2iAsPoint(hmdDesc.getWindowsPos());
     }
 
     @Override
@@ -88,8 +107,9 @@ public class OVRStereoDevice implements StereoDevice {
         final StringBuilder sb = new StringBuilder();
         sb.append("OVRStereoDevice[product "+hmdDesc.getProductNameAsString());
         sb.append(", vendor "+hmdDesc.getManufacturerAsString());
-        sb.append(", device "+hmdDesc.getDisplayDeviceNameAsString());
-        sb.append(", surfaceSize "+getSurfaceSize());
+        sb.append(", device "+deviceName);
+        sb.append(", DK "+dkVersion);
+        sb.append(", surfaceSize "+getSurfaceSize()+", reqRotation "+requiredRotation+" ccw-deg");
         sb.append(", surfacePos "+getPosition());
         sb.append(", distortionBits[supported ["+StereoUtil.distortionBitsToString(getSupportedDistortionBits())+
                       "], recommended ["+StereoUtil.distortionBitsToString(getRecommendedDistortionBits())+
@@ -103,14 +123,12 @@ public class OVRStereoDevice implements StereoDevice {
     }
 
     @Override
-    public final PointImmutable getPosition() {
-        return OVRUtil.getVec2iAsPoint(hmdDesc.getWindowsPos());
-    }
+    public final PointImmutable getPosition() { return position; }
 
     @Override
-    public final DimensionImmutable getSurfaceSize() {
-        return OVRUtil.getOVRSizei(hmdDesc.getResolution());
-    }
+    public final DimensionImmutable getSurfaceSize() { return resolution; }
+    @Override
+    public int getRequiredRotation() { return requiredRotation; }
 
     @Override
     public float[] getDefaultEyePositionOffset() {
@@ -182,38 +200,51 @@ public class OVRStereoDevice implements StereoDevice {
             System.err.println("XXX: eyeRenderDesc[1] "+OVRUtil.toString(eyeRenderDesc[1]));
         }
 
-        final ovrSizei recommenedTex0Size = OVR.ovrHmd_GetFovTextureSize(handle, OVR.ovrEye_Left,  eyeRenderDesc[0].getFov(), pixelsPerDisplayPixel);
-        final ovrSizei recommenedTex1Size = OVR.ovrHmd_GetFovTextureSize(handle, OVR.ovrEye_Right, eyeRenderDesc[1].getFov(), pixelsPerDisplayPixel);
+        final DimensionImmutable eye0TextureSize = OVRUtil.getOVRSizei(OVR.ovrHmd_GetFovTextureSize(handle, OVR.ovrEye_Left,  eyeRenderDesc[0].getFov(), pixelsPerDisplayPixel));
+        final DimensionImmutable eye1TextureSize = OVRUtil.getOVRSizei(OVR.ovrHmd_GetFovTextureSize(handle, OVR.ovrEye_Right, eyeRenderDesc[1].getFov(), pixelsPerDisplayPixel));
         if( StereoDevice.DEBUG ) {
-            System.err.println("XXX: recommenedTex0Size "+OVRUtil.toString(recommenedTex0Size));
-            System.err.println("XXX: recommenedTex1Size "+OVRUtil.toString(recommenedTex1Size));
+            System.err.println("XXX: recommenedTex0Size "+eye0TextureSize);
+            System.err.println("XXX: recommenedTex1Size "+eye1TextureSize);
         }
-        final int unifiedW = Math.max(recommenedTex0Size.getW(), recommenedTex1Size.getW());
-        final int unifiedH = Math.max(recommenedTex0Size.getH(), recommenedTex1Size.getH());
+        final int maxWidth = Math.max(eye0TextureSize.getWidth(), eye1TextureSize.getWidth());
+        final int maxHeight = Math.max(eye0TextureSize.getHeight(), eye1TextureSize.getHeight());
 
-        final DimensionImmutable singleTextureSize = new Dimension(unifiedW, unifiedH);
-        final DimensionImmutable totalTextureSize = new Dimension(recommenedTex0Size.getW() + recommenedTex1Size.getW(), unifiedH);
+        final DimensionImmutable[] eyeTextureSizes = new DimensionImmutable[] { eye0TextureSize, eye1TextureSize };
+        final DimensionImmutable totalTextureSize = new Dimension(eye0TextureSize.getWidth() + eye1TextureSize.getWidth(), maxHeight);
         if( StereoDevice.DEBUG ) {
-            System.err.println("XXX: textureSize Single "+singleTextureSize);
+            System.err.println("XXX: textureSize Single "+eyeTextureSizes);
             System.err.println("XXX: textureSize Total  "+totalTextureSize);
         }
 
-        final RectangleImmutable[] eyeRenderViewports = new RectangleImmutable[2];
+        final RectangleImmutable[] eyeViewports = new RectangleImmutable[2];
         if( 1 == textureCount ) { // validated in ctor below!
-            eyeRenderViewports[0] = new Rectangle(0, 0,
-                                                  totalTextureSize.getWidth() / 2,
-                                                  totalTextureSize.getHeight());
-
-            eyeRenderViewports[1] = new Rectangle((totalTextureSize.getWidth() + 1) / 2, 0,
-                                                  totalTextureSize.getWidth() / 2,
-                                                  totalTextureSize.getHeight());
+            // one big texture/FBO, viewport to target space
+            if( false && 2 == dkVersion ) {
+                eyeViewports[0] = new Rectangle(0, 0,
+                                                maxWidth,
+                                                eye0TextureSize.getHeight());
+                eyeViewports[1] = new Rectangle(0, eye0TextureSize.getHeight(),
+                                                maxWidth,
+                                                eye1TextureSize.getHeight());
+            } else {
+                eyeViewports[0] = new Rectangle(0, 0,
+                                                eye0TextureSize.getWidth(),
+                                                maxHeight);
+                eyeViewports[1] = new Rectangle(eye0TextureSize.getWidth(), 0,
+                                                eye1TextureSize.getWidth(),
+                                                maxHeight);
+            }
         } else {
-            eyeRenderViewports[0] = new Rectangle(0, 0,
-                                                  singleTextureSize.getWidth(),
-                                                  singleTextureSize.getHeight());
-            eyeRenderViewports[1] = eyeRenderViewports[0];
+            // two textures/FBOs w/ postprocessing, which renders textures/FBOs into target space
+            // FIXME: DK2
+            eyeViewports[0] = new Rectangle(0, 0,
+                                            eye0TextureSize.getWidth(),
+                                            eye0TextureSize.getHeight());
+            eyeViewports[1] = new Rectangle(0, 0,
+                                            eye1TextureSize.getWidth(),
+                                            eye1TextureSize.getHeight());
         }
         return new OVRStereoDeviceRenderer(this, distortionBits, textureCount, eyePositionOffset,
-                                           eyeRenderDesc, singleTextureSize, totalTextureSize, eyeRenderViewports, textureUnit);
+                                           eyeRenderDesc, eyeTextureSizes, totalTextureSize, eyeViewports, textureUnit);
     }
 }
\ No newline at end of file
diff --git a/src/oculusvr/classes/jogamp/opengl/oculusvr/OVRStereoDeviceFactory.java b/src/oculusvr/classes/jogamp/opengl/oculusvr/OVRStereoDeviceFactory.java
index 06f716ddc..dfaead1ea 100644
--- a/src/oculusvr/classes/jogamp/opengl/oculusvr/OVRStereoDeviceFactory.java
+++ b/src/oculusvr/classes/jogamp/opengl/oculusvr/OVRStereoDeviceFactory.java
@@ -30,8 +30,8 @@ package jogamp.opengl.oculusvr;
 import com.jogamp.oculusvr.OVR;
 import com.jogamp.oculusvr.OVRVersion;
 import com.jogamp.oculusvr.OvrHmdContext;
+import com.jogamp.opengl.util.stereo.StereoDeviceConfig;
 import com.jogamp.opengl.util.stereo.StereoDevice;
-import com.jogamp.opengl.util.stereo.StereoDevice.Config;
 import com.jogamp.opengl.util.stereo.StereoDeviceFactory;
 
 public class OVRStereoDeviceFactory extends StereoDeviceFactory {
@@ -44,7 +44,7 @@ public class OVRStereoDeviceFactory extends StereoDeviceFactory {
     }
 
     @Override
-    public final StereoDevice createDevice(final int deviceIndex, final Config config, final boolean verbose) {
+    public final StereoDevice createDevice(final int deviceIndex, final StereoDeviceConfig config, final boolean verbose) {
         final OvrHmdContext hmdCtx = OVR.ovrHmd_Create(deviceIndex);
         if( null == hmdCtx ) {
             if( verbose ) {
diff --git a/src/oculusvr/classes/jogamp/opengl/oculusvr/OVRStereoDeviceRenderer.java b/src/oculusvr/classes/jogamp/opengl/oculusvr/OVRStereoDeviceRenderer.java
index 1e5656129..5da5cbeca 100644
--- a/src/oculusvr/classes/jogamp/opengl/oculusvr/OVRStereoDeviceRenderer.java
+++ b/src/oculusvr/classes/jogamp/opengl/oculusvr/OVRStereoDeviceRenderer.java
@@ -29,6 +29,7 @@ package jogamp.opengl.oculusvr;
 
 import java.nio.FloatBuffer;
 import java.nio.ShortBuffer;
+import java.util.Arrays;
 
 import com.jogamp.nativewindow.util.DimensionImmutable;
 import com.jogamp.nativewindow.util.RectangleImmutable;
@@ -375,7 +376,7 @@ public class OVRStereoDeviceRenderer implements StereoDeviceRenderer {
     private final OVREye[] eyes;
     private final int distortionBits;
     private final int textureCount;
-    private final DimensionImmutable singleTextureSize;
+    private final DimensionImmutable[] eyeTextureSizes;
     private final DimensionImmutable totalTextureSize;
     private final GLUniformData texUnit0;
 
@@ -389,7 +390,7 @@ public class OVRStereoDeviceRenderer implements StereoDeviceRenderer {
     @Override
     public String toString() {
         return "OVRDist[distortion["+StereoUtil.distortionBitsToString(distortionBits)+
-                       "], singleSize "+singleTextureSize+
+                       "], eyeTexSize "+Arrays.toString(eyeTextureSizes)+
                        ", sbsSize "+totalTextureSize+
                        ", texCount "+textureCount+", texUnit "+getTextureUnit()+
                        ", "+PlatformPropsImpl.NEWLINE+"  "+eyes[0]+", "+PlatformPropsImpl.NEWLINE+"  "+eyes[1]+"]";
@@ -412,7 +413,8 @@ public class OVRStereoDeviceRenderer implements StereoDeviceRenderer {
 
     /* pp */ OVRStereoDeviceRenderer(final OVRStereoDevice context, final int distortionBits,
                              final int textureCount, final float[] eyePositionOffset,
-                             final ovrEyeRenderDesc[] eyeRenderDescs, final DimensionImmutable singleTextureSize, final DimensionImmutable totalTextureSize,
+                             final ovrEyeRenderDesc[] eyeRenderDescs,
+                             final DimensionImmutable[] eyeTextureSizes, final DimensionImmutable totalTextureSize,
                              final RectangleImmutable[] eyeViewports, final int textureUnit) {
         if( 1 > textureCount || 2 < textureCount ) {
             throw new IllegalArgumentException("textureCount can only be 1 or 2, has "+textureCount);
@@ -421,14 +423,21 @@ public class OVRStereoDeviceRenderer implements StereoDeviceRenderer {
         this.eyes = new OVREye[2];
         this.distortionBits = ( distortionBits | context.getMinimumDistortionBits() ) & context.getSupportedDistortionBits();
         this.textureCount = textureCount;
-        this.singleTextureSize = singleTextureSize;
+        this.eyeTextureSizes = eyeTextureSizes;
         this.totalTextureSize = totalTextureSize;
 
         texUnit0 = new GLUniformData("ovr_Texture0", textureUnit);
 
-        final ovrSizei ovrTextureSize = OVRUtil.createOVRSizei( 1 == textureCount ? totalTextureSize : singleTextureSize );
-        eyes[0] = new OVREye(context.handle, this.distortionBits, eyePositionOffset, eyeRenderDescs[0], ovrTextureSize, eyeViewports[0]);
-        eyes[1] = new OVREye(context.handle, this.distortionBits, eyePositionOffset, eyeRenderDescs[1], ovrTextureSize, eyeViewports[1]);
+        final ovrSizei ovrTexture0Size, ovrTexture1Size;
+        if( 1 == textureCount ) {
+            ovrTexture0Size = OVRUtil.createOVRSizei(totalTextureSize);
+            ovrTexture1Size = ovrTexture0Size;
+        } else {
+            ovrTexture0Size = OVRUtil.createOVRSizei(eyeTextureSizes[0]);
+            ovrTexture1Size = OVRUtil.createOVRSizei(eyeTextureSizes[1]);
+        }
+        eyes[0] = new OVREye(context.handle, this.distortionBits, eyePositionOffset, eyeRenderDescs[0], ovrTexture0Size, eyeViewports[0]);
+        eyes[1] = new OVREye(context.handle, this.distortionBits, eyePositionOffset, eyeRenderDescs[1], ovrTexture1Size, eyeViewports[1]);
         sp = null;
         frameTiming = null;
     }
@@ -445,7 +454,7 @@ public class OVRStereoDeviceRenderer implements StereoDeviceRenderer {
     public final boolean usesSideBySideStereo() { return true; }
 
     @Override
-    public final DimensionImmutable getSingleSurfaceSize() { return singleTextureSize; }
+    public final DimensionImmutable[] getEyeSurfaceSize() { return eyeTextureSizes; }
 
     @Override
     public final DimensionImmutable getTotalSurfaceSize() { return totalTextureSize; }