1 files changed, 44 insertions, 56 deletions

diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java
index da7b535cb..0e771fd0f 100644
--- a/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11PbufferGLXDrawable.java
@@ -1,22 +1,22 @@
 /*
  * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
  * Copyright (c) 2010 JogAmp Community. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  * - Redistribution of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
- * 
+ *
  * - Redistribution 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.
- * 
+ *
  * Neither the name of Sun Microsystems, Inc. or the names of
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * 
+ *
  * This software is provided "AS IS," without a warranty of any kind. ALL
  * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
  * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
@@ -29,32 +29,38 @@
  * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
  * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
  * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * 
+ *
  * You acknowledge that this software is not designed or intended for use
  * in the design, construction, operation or maintenance of any nuclear
  * facility.
- * 
+ *
  * Sun gratefully acknowledges that this software was originally authored
  * and developed by Kenneth Bradley Russell and Christopher John Kline.
  */
 
 package jogamp.opengl.x11.glx;
 
-import javax.media.opengl.*;
-import javax.media.nativewindow.*;
+import java.nio.IntBuffer;
+
+import javax.media.nativewindow.AbstractGraphicsDevice;
+import javax.media.nativewindow.AbstractGraphicsScreen;
+import javax.media.nativewindow.NativeSurface;
+import javax.media.nativewindow.MutableSurface;
+import javax.media.opengl.GLContext;
+import javax.media.opengl.GLDrawableFactory;
+import javax.media.opengl.GLException;
+
+import com.jogamp.common.nio.Buffers;
 
 public class X11PbufferGLXDrawable extends X11GLXDrawable {
   protected X11PbufferGLXDrawable(GLDrawableFactory factory, NativeSurface target) {
-                                  /* GLCapabilities caps, 
+                                  /* GLCapabilities caps,
                                   GLCapabilitiesChooser chooser,
                                   int width, int height */
     super(factory, target, false);
   }
 
-  protected void destroyImpl() {
-    setRealized(false);
-  }
-  
+  @Override
   protected void setRealizedImpl() {
     if(realized) {
         createPbuffer();
@@ -63,8 +69,9 @@ public class X11PbufferGLXDrawable extends X11GLXDrawable {
     }
   }
 
+  @Override
   public GLContext createContext(GLContext shareWith) {
-    return new X11PbufferGLXContext(this, shareWith);
+    return new X11GLXContext(this, shareWith);
   }
 
   protected void destroyPbuffer() {
@@ -72,69 +79,50 @@ public class X11PbufferGLXDrawable extends X11GLXDrawable {
     if (ns.getSurfaceHandle() != 0) {
       GLX.glXDestroyPbuffer(ns.getDisplayHandle(), ns.getSurfaceHandle());
     }
-    ((SurfaceChangeable)ns).setSurfaceHandle(0);
+    ((MutableSurface)ns).setSurfaceHandle(0);
+    if (DEBUG) {
+        System.err.println(getThreadName()+": Destroyed pbuffer " + this);
+    }
   }
 
   private void createPbuffer() {
-      X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration) getNativeSurface().getGraphicsConfiguration();
-      AbstractGraphicsScreen aScreen = config.getScreen();
-      AbstractGraphicsDevice aDevice = aScreen.getDevice();
-      long display = aDevice.getHandle();
+      final MutableSurface ms = (MutableSurface) getNativeSurface();
+      final X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration) ms.getGraphicsConfiguration();
+      final AbstractGraphicsScreen aScreen = config.getScreen();
+      final AbstractGraphicsDevice aDevice = aScreen.getDevice();
+      final long display = aDevice.getHandle();
 
       if (DEBUG) {
-        System.out.println("Pbuffer config: " + config);
+        System.out.println(getThreadName()+": Pbuffer config: " + config);
       }
 
       if (display==0) {
         throw new GLException("Null display");
       }
 
-      NativeSurface ns = getNativeSurface();
-    
-      GLCapabilitiesImmutable chosenCaps = (GLCapabilitiesImmutable)config.getChosenCapabilities();
-
-      if (chosenCaps.getPbufferRenderToTexture()) {
-        throw new GLException("Render-to-texture pbuffers not supported yet on X11");
-      }
-
-      if (chosenCaps.getPbufferRenderToTextureRectangle()) {
-        throw new GLException("Render-to-texture-rectangle pbuffers not supported yet on X11");
-      }
-
       // Create the p-buffer.
       int niattribs = 0;
-      int[] iattributes = new int[5];
+      IntBuffer iattributes = Buffers.newDirectIntBuffer(7);
 
-      iattributes[niattribs++] = GLX.GLX_PBUFFER_WIDTH;
-      iattributes[niattribs++] = ns.getWidth();
-      iattributes[niattribs++] = GLX.GLX_PBUFFER_HEIGHT;
-      iattributes[niattribs++] = ns.getHeight();
-      iattributes[niattribs++] = 0;
+      iattributes.put(niattribs++, GLX.GLX_PBUFFER_WIDTH);
+      iattributes.put(niattribs++, ms.getWidth());
+      iattributes.put(niattribs++, GLX.GLX_PBUFFER_HEIGHT);
+      iattributes.put(niattribs++, ms.getHeight());
+      iattributes.put(niattribs++, GLX.GLX_LARGEST_PBUFFER); // exact
+      iattributes.put(niattribs++, 0);
+      iattributes.put(niattribs++, 0);
 
-      long pbuffer = GLX.glXCreatePbuffer(display, config.getFBConfig(), iattributes, 0);
+      long pbuffer = GLX.glXCreatePbuffer(display, config.getFBConfig(), iattributes);
       if (pbuffer == 0) {
         // FIXME: query X error code for detail error message
         throw new GLException("pbuffer creation error: glXCreatePbuffer() failed");
       }
 
       // Set up instance variables
-      ((SurfaceChangeable)ns).setSurfaceHandle(pbuffer);
-      
-      // Determine the actual width and height we were able to create.
-      int[] tmp = new int[1];
-      GLX.glXQueryDrawable(display, pbuffer, GLX.GLX_WIDTH, tmp, 0);
-      int width = tmp[0];
-      GLX.glXQueryDrawable(display, pbuffer, GLX.GLX_HEIGHT, tmp, 0);
-      int height = tmp[0];
-      ((SurfaceChangeable)ns).surfaceSizeChanged(width, height);
-      
+      ms.setSurfaceHandle(pbuffer);
+
       if (DEBUG) {
-        System.err.println("Created pbuffer " + this);
+        System.err.println(getThreadName()+": Created pbuffer " + this);
       }
   }
-
-  public int getFloatingPointMode() {
-    // Floating-point pbuffers currently require NVidia hardware on X11
-    return GLPbuffer.NV_FLOAT;
-  }
 }