constrain depth and stencil bits to requested values, use capabilities

codeanticode · codeanticode · commit cca37ba7940a · 2013-10-24T17:59:27.000-04:00
to obtain current values
diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java
@@ -527,8 +527,8 @@ protected void createFBOLayer() {
     boolean multisample = 1 < numSamples;
 
     boolean packed = ext.indexOf("packed_depth_stencil") != -1;
-    int depthBits = getDepthBits();
-    int stencilBits = getStencilBits();
+    int depthBits = PApplet.min(REQUESTED_DEPTH_BITS, getDepthBits());
+    int stencilBits = PApplet.min(REQUESTED_STENCIL_BITS, getStencilBits());
 
     genTextures(2, glColorTex);
     for (int i = 0; i < 2; i++) {
diff --git a/core/src/processing/opengl/PJOGL.java b/core/src/processing/opengl/PJOGL.java
@@ -452,15 +452,13 @@ protected boolean isFBOBacked() {
 
   @Override
   protected int getDepthBits() {
-    if (USE_JOGL_FBOLAYER) return capabilities.getDepthBits();
-    else return super.getDepthBits();
+    return capabilities.getDepthBits();
   }
 
 
   @Override
   protected int getStencilBits() {
-    if (USE_JOGL_FBOLAYER) return capabilities.getStencilBits();
-    else return super.getStencilBits();
+    return capabilities.getStencilBits();
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -452,15 +452,13 @@ protected boolean isFBOBacked() {`
`452`	`452`
`453`	`453`	`@Override`
`454`	`454`	`protected int getDepthBits() {`
`455`		`- if (USE_JOGL_FBOLAYER) return capabilities.getDepthBits();`
`456`		`- else return super.getDepthBits();`
	`455`	`+ return capabilities.getDepthBits();`
`457`	`456`	`}`
`458`	`457`
`459`	`458`
`460`	`459`	`@Override`
`461`	`460`	`protected int getStencilBits() {`
`462`		`- if (USE_JOGL_FBOLAYER) return capabilities.getStencilBits();`
`463`		`- else return super.getStencilBits();`
	`461`	`+ return capabilities.getStencilBits();`
`464`	`462`	`}`
`465`	`463`
`466`	`464`