Further context-related changes for the JSR-231 API. The GLContext

implementations on all platforms have been split into orthogonal
GLDrawable and GLContext concepts. It is now possible to create more
than one GLContet per GLDrawable (though this has not been tested
yet). GLCanvas has been reimplemented in terms of
GLDrawableFactory.getGLDrawable(). More functionality has been moved
from GLDrawable to GLAutoDrawable. Reimplemented lazy sending of
reshape GLEventListener events in GLCanvas and GLJPanel and deleted
notion of deferred reshapes from GLDrawableHelper and elsewhere.
Sharing of textures and display lists is now expressed in terms of
GLContexts instead of GLDrawables. Still need to move pbuffer creation
into GLDrawableFactory from the onscreen GLContext implementations.
Added option to gleem ExaminerViewer to disable automatic redraws upon
mouse events and respecified more of gleem to work on GLAutoDrawables
rather than GLDrawables. Updated all JOGL demos to work with new APIs
and slightly different initialization sequences (in particular, for
pbuffers -- this will change with the addition of
GLDrawableFactory.createGLPbuffer()).


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@324 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 46 insertions, 220 deletions

diff --git a/src/net/java/games/jogl/impl/x11/X11PbufferGLContext.java b/src/net/java/games/jogl/impl/x11/X11PbufferGLContext.java
index 30a60ba61..bebbdb91c 100644
--- a/src/net/java/games/jogl/impl/x11/X11PbufferGLContext.java
+++ b/src/net/java/games/jogl/impl/x11/X11PbufferGLContext.java
@@ -43,40 +43,21 @@ import net.java.games.jogl.*;
 import net.java.games.jogl.impl.*;
 
 public class X11PbufferGLContext extends X11GLContext {
-  private static final boolean DEBUG = Debug.debug("X11PbufferGLContext");
+  private X11PbufferGLDrawable drawable;
 
-  private int  initWidth;
-  private int  initHeight;
-
-  private long buffer;   // GLXPbuffer
-  private GLXFBConfig fbConfig;
-  private int  width;
-  private int  height;
-
-  // FIXME: kept around because we create the OpenGL context lazily to
-  // better integrate with the X11GLContext framework
-  private long parentContext;
-
-  private static final int MAX_PFORMATS = 256;
-  private static final int MAX_ATTRIBS  = 256;
-
-  public X11PbufferGLContext(GLCapabilities capabilities, int initialWidth, int initialHeight) {
-    super(null, capabilities, null, null);
-    this.initWidth  = initialWidth;
-    this.initHeight = initialHeight;
-    if (initWidth <= 0 || initHeight <= 0) {
-      throw new GLException("Initial width and height of pbuffer must be positive (were (" +
-			    initWidth + ", " + initHeight + "))");
-    }
+  public X11PbufferGLContext(X11PbufferGLDrawable drawable,
+                             GLContext shareWith) {
+    super(drawable, shareWith);
+    this.drawable = drawable;
   }
 
   public boolean canCreatePbufferContext() {
     return false;
   }
 
-  public GLContext createPbufferContext(GLCapabilities capabilities,
-                                        int initialWidth,
-                                        int initialHeight) {
+  public GLDrawableImpl createPbufferDrawable(GLCapabilities capabilities,
+                                              int initialWidth,
+                                              int initialHeight) {
     throw new GLException("Not supported");
   }
 
@@ -90,169 +71,40 @@ public class X11PbufferGLContext extends X11GLContext {
     throw new GLException("Not yet implemented");
   }
 
-  public void createPbuffer(long display, long parentContext, GL gl) {
-    if (display == 0) {
-      throw new GLException("Null display");
-    }
-    
-    if (parentContext == 0) {
-      throw new GLException("Null parentContext");
-    }
-
-    if (capabilities.getOffscreenRenderToTexture()) {
-      throw new GLException("Render-to-texture pbuffers not supported yet on X11");
-    }
-
-    if (capabilities.getOffscreenRenderToTextureRectangle()) {
-      throw new GLException("Render-to-texture-rectangle pbuffers not supported yet on X11");
-    }
-
-    int[]   iattributes = new int  [2*MAX_ATTRIBS];
-    float[] fattributes = new float[2*MAX_ATTRIBS];
-    int nfattribs = 0;
-    int niattribs = 0;
-
-    // Since we are trying to create a pbuffer, the GLXFBConfig we
-    // request (and subsequently use) must be "p-buffer capable".
-    iattributes[niattribs++] = GL.GLX_DRAWABLE_TYPE;
-    iattributes[niattribs++] = GL.GLX_PBUFFER_BIT;
-
-    iattributes[niattribs++] = GL.GLX_RENDER_TYPE;
-    iattributes[niattribs++] = GL.GLX_RGBA_BIT;
-
-    iattributes[niattribs++] = GLX.GLX_DOUBLEBUFFER;
-    if (capabilities.getDoubleBuffered()) {
-      iattributes[niattribs++] = GL.GL_TRUE;
-    } else {
-      iattributes[niattribs++] = GL.GL_FALSE;
-    }
-
-    iattributes[niattribs++] = GLX.GLX_DEPTH_SIZE;
-    iattributes[niattribs++] = capabilities.getDepthBits();
-
-    iattributes[niattribs++] = GLX.GLX_RED_SIZE;
-    iattributes[niattribs++] = capabilities.getRedBits();
-
-    iattributes[niattribs++] = GLX.GLX_GREEN_SIZE;
-    iattributes[niattribs++] = capabilities.getGreenBits();
-
-    iattributes[niattribs++] = GLX.GLX_BLUE_SIZE;
-    iattributes[niattribs++] = capabilities.getBlueBits();
-
-    iattributes[niattribs++] = GLX.GLX_ALPHA_SIZE;
-    iattributes[niattribs++] = capabilities.getAlphaBits();
-
-    if (capabilities.getStencilBits() > 0) {
-      iattributes[niattribs++] = GLX.GLX_STENCIL_SIZE;
-      iattributes[niattribs++] = capabilities.getStencilBits();
-    }
-
-    if (capabilities.getAccumRedBits()   > 0 ||
-        capabilities.getAccumGreenBits() > 0 ||
-        capabilities.getAccumBlueBits()  > 0) {
-      iattributes[niattribs++] = GLX.GLX_ACCUM_RED_SIZE;
-      iattributes[niattribs++] = capabilities.getAccumRedBits();
-      iattributes[niattribs++] = GLX.GLX_ACCUM_GREEN_SIZE;
-      iattributes[niattribs++] = capabilities.getAccumGreenBits();
-      iattributes[niattribs++] = GLX.GLX_ACCUM_BLUE_SIZE;
-      iattributes[niattribs++] = capabilities.getAccumBlueBits();
-    }
-
-    if (capabilities.getOffscreenFloatingPointBuffers()) {
-      if (!gl.isExtensionAvailable("GLX_NV_float_buffer")) {
-        throw new GLException("Floating-point pbuffers on X11 currently require NVidia hardware");
-      }
-      iattributes[niattribs++] = GLX.GLX_FLOAT_COMPONENTS_NV;
-      iattributes[niattribs++] = GL.GL_TRUE;
-    }
-
-    // FIXME: add FSAA support? Don't want to get into a situation
-    // where we have to retry the glXChooseFBConfig call if it fails
-    // due to a lack of an antialiased visual...
-
-    iattributes[niattribs++] = 0; // null-terminate
-
-    int screen = 0; // FIXME: provide way to specify this?
-    int[] nelementsTmp = new int[1];
-    GLXFBConfig[] fbConfigs = GLX.glXChooseFBConfig(display, screen, iattributes, 0, nelementsTmp, 0);
-    if (fbConfigs == null || fbConfigs.length == 0 || fbConfigs[0] == null) {
-      throw new GLException("pbuffer creation error: glXChooseFBConfig() failed");
-    }
-    // Note that we currently don't allow selection of anything but
-    // the first GLXFBConfig in the returned list
-    GLXFBConfig fbConfig = fbConfigs[0];
-    int nelements = nelementsTmp[0];
-    if (nelements <= 0) {
-      throw new GLException("pbuffer creation error: couldn't find a suitable frame buffer configuration");
-    }
-
-    if (DEBUG) {
-      System.err.println("Found " + fbConfigs.length + " matching GLXFBConfigs");
-      System.err.println("Parameters of default one:");
-      System.err.println("render type: 0x" + Integer.toHexString(queryFBConfig(display, fbConfig, GLX.GLX_RENDER_TYPE)));
-      System.err.println("rgba: " + ((queryFBConfig(display, fbConfig, GLX.GLX_RENDER_TYPE) & GLX.GLX_RGBA_BIT) != 0));
-      System.err.println("r: " + queryFBConfig(display, fbConfig, GLX.GLX_RED_SIZE));
-      System.err.println("g: " + queryFBConfig(display, fbConfig, GLX.GLX_GREEN_SIZE));
-      System.err.println("b: " + queryFBConfig(display, fbConfig, GLX.GLX_BLUE_SIZE));
-      System.err.println("a: " + queryFBConfig(display, fbConfig, GLX.GLX_ALPHA_SIZE));
-      System.err.println("depth: " + queryFBConfig(display, fbConfig, GLX.GLX_DEPTH_SIZE));
-      System.err.println("double buffered: " + queryFBConfig(display, fbConfig, GLX.GLX_DOUBLEBUFFER));
-    }
-
-    // Create the p-buffer.
-    niattribs = 0;
-
-    iattributes[niattribs++] = GL.GLX_PBUFFER_WIDTH;
-    iattributes[niattribs++] = initWidth;
-    iattributes[niattribs++] = GL.GLX_PBUFFER_HEIGHT;
-    iattributes[niattribs++] = initHeight;
-
-    iattributes[niattribs++] = 0;
-
-    long tmpBuffer = GLX.glXCreatePbuffer(display, fbConfig, iattributes, 0);
-    if (tmpBuffer == 0) {
-      // FIXME: query X error code for detail error message
-      throw new GLException("pbuffer creation error: glXCreatePbuffer() failed");
-    }
-
-    // Set up instance variables
-    this.display = display;
-    mostRecentDisplay = display;
-    this.parentContext = parentContext;
-    buffer = tmpBuffer;
-    this.fbConfig = fbConfig;
-
-    // Determine the actual width and height we were able to create.
-    int[] tmp = new int[1];
-    GLX.glXQueryDrawable(display, (int) buffer, GL.GLX_WIDTH, tmp, 0);
-    width = tmp[0];
-    GLX.glXQueryDrawable(display, (int) buffer, GL.GLX_HEIGHT, tmp, 0);
-    height = tmp[0];
-
-    if (DEBUG) {
-      System.err.println("Created pbuffer " + width + " x " + height);
-    }
-  }
-
   protected int makeCurrentImpl() throws GLException {
-    if (buffer == 0) {
-      // pbuffer not instantiated yet
+    if (drawable.getDrawable() == 0) {
+      // pbuffer not instantiated (yet?)
+      if (DEBUG) {
+        System.err.println("pbuffer not instantiated");
+      }
       return CONTEXT_NOT_CURRENT;
     }
 
+    // Note that we have to completely override makeCurrentImpl
+    // because the underlying makeCurrent call differs for pbuffers
     lockAWT();
     try {
       boolean created = false;
       if (context == 0) {
         create();
         if (DEBUG) {
-          System.err.println("!!! Created GL context for " + getClass().getName());
+          System.err.println(getThreadName() + ": !!! Created GL context for " + getClass().getName());
         }
         created = true;
       }
 
-      if (!GLX.glXMakeContextCurrent(display, buffer, buffer, context)) {
+      if (!GLX.glXMakeContextCurrent(drawable.getDisplay(),
+                                     drawable.getDrawable(),
+                                     drawable.getDrawable(),
+                                     context)) {
         throw new GLException("Error making context current");
+      } else {
+        mostRecentDisplay = drawable.getDisplay();
+        if (DEBUG && VERBOSE) {
+          System.err.println(getThreadName() + ": glXMakeCurrent(display " + toHexString(drawable.getDisplay()) +
+                             ", drawable " + toHexString(drawable.getDrawable()) +
+                             ", context " + toHexString(context) + ") succeeded");
+        }
       }
 
       if (created) {
@@ -268,7 +120,7 @@ public class X11PbufferGLContext extends X11GLContext {
   protected void releaseImpl() throws GLException {
     lockAWT();
     try {
-      if (!GLX.glXMakeContextCurrent(display, 0, 0, 0)) {
+      if (!GLX.glXMakeContextCurrent(drawable.getDisplay(), 0, 0, 0)) {
         throw new GLException("Error freeing OpenGL context");
       }
     } finally {
@@ -276,16 +128,6 @@ public class X11PbufferGLContext extends X11GLContext {
     }
   }
 
-  public void handleModeSwitch(long parentHdc, long parentHglrc) {
-    throw new GLException("Not yet implemented");
-  }
-
-  protected boolean isOffscreen() {
-    // FIXME: currently the only caller of this won't cause proper
-    // resizing of the pbuffer anyway.
-    return false;
-  }
-
   public int getOffscreenContextReadBuffer() {
     throw new GLException("Should not call this");
   }
@@ -294,50 +136,34 @@ public class X11PbufferGLContext extends X11GLContext {
     throw new GLException("Should not call this");
   }
 
+  public int getFloatingPointMode() {
+    return drawable.getFloatingPointMode();
+  }
+
   protected void create() {
     if (DEBUG) {
-      System.err.println("Creating context for pbuffer " + width + " x " + height);
+      System.err.println("Creating context for pbuffer " + drawable.getWidth() +
+                         " x " + drawable.getHeight());
     }
 
     // Create a gl context for the p-buffer.
-    // FIXME: provide option to not share display lists with subordinate pbuffer?
-    context = GLX.glXCreateNewContext(display, fbConfig, GL.GLX_RGBA_TYPE, parentContext, true);
+    X11GLContext other = (X11GLContext) GLContextShareSet.getShareContext(this);
+    long share = 0;
+    if (other != null) {
+      share = other.getContext();
+      if (share == 0) {
+        throw new GLException("GLContextShareSet returned an invalid OpenGL context");
+      }
+    }
+    context = GLX.glXCreateNewContext(drawable.getDisplay(), drawable.getFBConfig(), GL.GLX_RGBA_TYPE, share, true);
     if (context == 0) {
       throw new GLException("pbuffer creation error: glXCreateNewContext() failed");
     }
+    GLContextShareSet.contextCreated(this);
 
     if (DEBUG) {
-      System.err.println("Created context for pbuffer " + width + " x " + height);
-    }
-  }
-
-  protected void destroyImpl() throws GLException {
-    lockAWT();
-    try {
-      if (context != 0) {
-        super.destroyImpl();
-        GLX.glXDestroyPbuffer(display, buffer);
-        buffer = 0;
-      }
-    } finally {
-      unlockAWT();
-    }
-  }
-
-  public void swapBuffers() throws GLException {
-    // FIXME: do we need to do anything if the pbuffer is double-buffered?
-  }
-
-  public int getFloatingPointMode() {
-    // Floating-point pbuffers currently require NVidia hardware on X11
-    return GLPbuffer.NV_FLOAT;
-  }
-
-  private int queryFBConfig(long display, GLXFBConfig fbConfig, int attrib) {
-    int[] tmp = new int[1];
-    if (GLX.glXGetFBConfigAttrib(display, fbConfig, attrib, tmp, 0) != 0) {
-      throw new GLException("glXGetFBConfigAttrib failed");
+      System.err.println("Created context for pbuffer " + drawable.getWidth() +
+                         " x " + drawable.getHeight());
     }
-    return tmp[0];
   }
 }