Misc Cleanups

- www/index.html: absolute local refs -> relative

- Platform GLContextImpl specialisations: remove local overriding drawable instance

- X11ExternalGLXDrawable: Remove dead code, left over.

4 files changed, 5 insertions, 21 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
index 006a55e20..d930179df 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11ExternalGLXDrawable.java
@@ -47,19 +47,8 @@ import com.jogamp.nativewindow.impl.NullWindow;
 
 public class X11ExternalGLXDrawable extends X11GLXDrawable {
 
-    //TODO? those are not used
-//  private int fbConfigID;
-//  private int renderType;
-
-  private X11ExternalGLXDrawable(GLDrawableFactory factory, NativeWindow component, int renderType) {
+  private X11ExternalGLXDrawable(GLDrawableFactory factory, NativeWindow component) {
     super(factory, component, true);
-
-//    this.renderType = renderType;
-
-    // Need GLXFBConfig ID in order to properly create new contexts
-    // on this drawable
-//    X11GLXGraphicsConfiguration cfg = (X11GLXGraphicsConfiguration) component.getGraphicsConfiguration();
-//    fbConfigID = cfg.getFBConfigID();
   }
 
   protected static X11ExternalGLXDrawable create(GLDrawableFactory factory, GLProfile glp) {
@@ -97,7 +86,7 @@ public class X11ExternalGLXDrawable extends X11GLXDrawable {
     NullWindow nw = new NullWindow(cfg);
     nw.setSurfaceHandle(drawable);
     nw.setSize(w, h);
-    return new X11ExternalGLXDrawable(factory, nw, GLX.GLX_RGBA_TYPE);
+    return new X11ExternalGLXDrawable(factory, nw);
   }
 
   public GLContext createContext(GLContext shareWith) {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
index 8fcc7994b..9884db288 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXGraphicsConfigurationFactory.java
@@ -132,7 +132,6 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
         }
 
         GLCapabilities caps2 = (GLCapabilities) capabilities.clone();
-        GLCapabilitiesChooser glChooser = chooser;
 
         boolean usePBuffer = caps2.isPBuffer();
 
@@ -141,12 +140,12 @@ public class X11GLXGraphicsConfigurationFactory extends GraphicsConfigurationFac
             caps2.setDoubleBuffered(false);
         }
     
-        X11GLXGraphicsConfiguration res = chooseGraphicsConfigurationFBConfig(caps2, glChooser, x11Screen);
+        X11GLXGraphicsConfiguration res = chooseGraphicsConfigurationFBConfig(caps2, chooser, x11Screen);
         if(null==res) {
             if(usePBuffer) {
                 throw new GLException("Error: Couldn't create X11GLXGraphicsConfiguration based on FBConfig for "+caps2);
             }
-            res = chooseGraphicsConfigurationXVisual(caps2, glChooser, x11Screen);
+            res = chooseGraphicsConfigurationXVisual(caps2, chooser, x11Screen);
         }
         if(null==res) {
             throw new GLException("Error: Couldn't create X11GLXGraphicsConfiguration based on FBConfig and XVisual for "+caps2);
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java
index f3674c108..6f24d5a60 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11OffscreenGLXContext.java
@@ -42,12 +42,10 @@ package com.jogamp.opengl.impl.x11.glx;
 import javax.media.opengl.*;
 
 public class X11OffscreenGLXContext extends X11GLXContext {
-  private X11OffscreenGLXDrawable drawable;
 
   public X11OffscreenGLXContext(X11OffscreenGLXDrawable drawable,
                                GLContext shareWith) {
     super(drawable, shareWith);
-    this.drawable = drawable;
   }
 
   public int getOffscreenContextPixelDataType() {
diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java
index 8d118f2df..85bbade24 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11PbufferGLXContext.java
@@ -42,11 +42,9 @@ package com.jogamp.opengl.impl.x11.glx;
 import javax.media.opengl.*;
 
 public class X11PbufferGLXContext extends X11GLXContext {
-  private X11PbufferGLXDrawable drawable;
 
   public X11PbufferGLXContext(X11PbufferGLXDrawable drawable, GLContext shareWith) {
     super(drawable, shareWith);
-    this.drawable = drawable;
   }
 
   public void bindPbufferToTexture() {
@@ -61,7 +59,7 @@ public class X11PbufferGLXContext extends X11GLXContext {
 
 
   public int getFloatingPointMode() {
-    return drawable.getFloatingPointMode();
+    return ((X11PbufferGLXDrawable)drawable).getFloatingPointMode();
   }
 
   protected boolean createImpl() {