1 files changed, 57 insertions, 29 deletions
diff --git a/src/jogl/classes/jogamp/opengl/GLOffscreenAutoDrawableImpl.java b/src/jogl/classes/jogamp/opengl/GLOffscreenAutoDrawableImpl.java
index 7701f209f..721dc7384 100644
--- a/src/jogl/classes/jogamp/opengl/GLOffscreenAutoDrawableImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLOffscreenAutoDrawableImpl.java
@@ -3,14 +3,14 @@
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
- * 
+ *
  *    1. Redistributions of source code must retain the above copyright notice, this list of
  *       conditions and the following disclaimer.
- * 
+ *
  *    2. Redistributions in binary form must reproduce the above copyright notice, this list
  *       of conditions and the following disclaimer in the documentation and/or other materials
  *       provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
@@ -20,7 +20,7 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * The views and conclusions contained in the software and documentation are those of the
  * authors and should not be interpreted as representing official policies, either expressed
  * or implied, of JogAmp Community.
@@ -42,33 +42,39 @@ import com.jogamp.opengl.GLAutoDrawableDelegate;
 import jogamp.opengl.GLFBODrawableImpl;
 
 public class GLOffscreenAutoDrawableImpl extends GLAutoDrawableDelegate implements GLOffscreenAutoDrawable {
-  
+
     /**
-     * @param drawable a valid and already realized {@link GLDrawable}
-     * @param context a valid {@link GLContext}, may not be made current (created) yet.
+     * @param drawable a valid {@link GLDrawable}, may not be {@link GLDrawable#isRealized() realized} yet.
+     * @param context a valid {@link GLContext},
+     *                may not have been made current (created) yet,
+     *                may not be associated w/ <code>drawable<code> yet,
+     *                may be <code>null</code> for lazy initialization at 1st {@link #display()}.
      * @param upstreamWidget optional UI element holding this instance, see {@link #getUpstreamWidget()}.
      * @param lock optional upstream lock, may be null
      */
-    public GLOffscreenAutoDrawableImpl(GLDrawable drawable, GLContext context, Object upstreamWidget, RecursiveLock lock) {
+    public GLOffscreenAutoDrawableImpl(final GLDrawable drawable, final GLContext context, final Object upstreamWidget, final RecursiveLock lock) {
         super(drawable, context, upstreamWidget, true, lock);
     }
-    
+
     @Override
-    public void setSize(int newWidth, int newHeight) throws NativeWindowException, GLException {
+    public void setSurfaceSize(final int newWidth, final int newHeight) throws NativeWindowException, GLException {
         this.defaultWindowResizedOp(newWidth, newHeight);
     }
-    
-    public static class FBOImpl extends GLOffscreenAutoDrawableImpl implements GLOffscreenAutoDrawable.FBO {      
+
+    public static class FBOImpl extends GLOffscreenAutoDrawableImpl implements GLOffscreenAutoDrawable.FBO {
         /**
-         * @param drawable a valid and already realized {@link GLDrawable}
-         * @param context a valid {@link GLContext}, may not be made current (created) yet.
+         * @param drawable a valid {@link GLDrawable}, may not be {@link GLDrawable#isRealized() realized} yet.
+         * @param context a valid {@link GLContext},
+         *                may not have been made current (created) yet,
+         *                may not be associated w/ <code>drawable<code> yet,
+         *                may be <code>null</code> for lazy initialization
          * @param upstreamWidget optional UI element holding this instance, see {@link #getUpstreamWidget()}.
          * @param lock optional upstream lock, may be null
          */
-        public FBOImpl(GLFBODrawableImpl drawable, GLContext context, Object upstreamWidget, RecursiveLock lock) {
+        public FBOImpl(final GLFBODrawableImpl drawable, final GLContext context, final Object upstreamWidget, final RecursiveLock lock) {
             super(drawable, context, upstreamWidget, lock);
         }
-        
+
         @Override
         public boolean isInitialized() {
             return ((GLFBODrawableImpl)drawable).isInitialized();
@@ -78,9 +84,9 @@ public class GLOffscreenAutoDrawableImpl extends GLAutoDrawableDelegate implemen
         public final int getTextureUnit() {
             return ((GLFBODrawableImpl)drawable).getTextureUnit();
         }
-        
+
         @Override
-        public final void setTextureUnit(int unit) {
+        public final void setTextureUnit(final int unit) {
             ((GLFBODrawableImpl)drawable).setTextureUnit(unit);
         }
 
@@ -88,13 +94,23 @@ public class GLOffscreenAutoDrawableImpl extends GLAutoDrawableDelegate implemen
         public final int getNumSamples() {
             return ((GLFBODrawableImpl)drawable).getNumSamples();
         }
-        
+
         @Override
-        public final void setNumSamples(GL gl, int newSamples) throws GLException {
+        public final void setNumSamples(final GL gl, final int newSamples) throws GLException {
             ((GLFBODrawableImpl)drawable).setNumSamples(gl, newSamples);
             windowRepaintOp();
         }
-        
+
+        @Override
+        public final int setNumBuffers(final int bufferCount) throws /* IllegalStateException, */ GLException {
+            return ((GLFBODrawableImpl)drawable).setNumBuffers(bufferCount);
+        }
+
+        @Override
+        public final int getNumBuffers() {
+            return ((GLFBODrawableImpl)drawable).getNumBuffers();
+        }
+
         /** // TODO: Add or remove TEXTURE (only) DoubleBufferMode support
         @Override
         public DoubleBufferMode getDoubleBufferMode() {
@@ -103,21 +119,33 @@ public class GLOffscreenAutoDrawableImpl extends GLAutoDrawableDelegate implemen
 
         @Override
         public void setDoubleBufferMode(DoubleBufferMode mode) throws GLException {
-            ((GLFBODrawableImpl)drawable).setDoubleBufferMode(mode);            
+            ((GLFBODrawableImpl)drawable).setDoubleBufferMode(mode);
         } */
-        
+
         @Override
-        public final FBObject getFBObject(int bufferName) { 
+        public final FBObject getFBObject(final int bufferName) {
             return ((GLFBODrawableImpl)drawable).getFBObject(bufferName);
         }
-        
-        public final FBObject.TextureAttachment getTextureBuffer(int bufferName) {
-            return ((GLFBODrawableImpl)drawable).getTextureBuffer(bufferName);
+
+        @Override
+        public final FBObject.Colorbuffer getColorbuffer(final int bufferName) {
+            return ((GLFBODrawableImpl)drawable).getColorbuffer(bufferName);
         }
 
         @Override
-        public void resetSize(GL gl) throws GLException {
+        public void resetSize(final GL gl) throws GLException {
             ((GLFBODrawableImpl)drawable).resetSize(gl);
-        }        
+        }
+
+        @Override
+        public final void setFBOMode(final int modeBits) throws IllegalStateException {
+            ((GLFBODrawableImpl)drawable).setFBOMode(modeBits);
+
+        }
+
+        @Override
+        public final int getFBOMode() {
+            return ((GLFBODrawableImpl)drawable).getFBOMode();
+        }
     }
 }