GLDrawableFactory Cleanup (-> On- Offscreen and PBuffer)

    - Base all PBuffer/Offscreen GLDrawable creators on
      a prev. created 'NativeWindow + SurfaceChangeable' instance.
      Simplifies implementation path.

      This also removes the almost cyclic referencing of
          GLWindow -> OffscreenWindow
          GLWindow -> Drawable -> NullWindow -> OffscreenWindow
      Now it is just
          GLWindow -> OffscreenWindow
          GLWindow -> Drawable -> OffscreenWindow

    - createGLDrawable() shall be used for all types now,
      especially if you want to pass the offscreen NativeWindow
      and benefit from the surfaceChangedListener etc ..

    - Add public createOffscreenDrawable(..)

    - EGLDrawable:
        - Query surface only if not 0
        - [re]create surface only if needed,
          using 'ownEGL*' flag for destruction only.

1 files changed, 5 insertions, 16 deletions

diff --git a/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java b/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java
index 6f568df13..ca55aa542 100644
--- a/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java
+++ b/src/nativewindow/classes/com/sun/nativewindow/impl/NullWindow.java
@@ -38,7 +38,7 @@ package com.sun.nativewindow.impl;
 
 import javax.media.nativewindow.*;
 
-public class NullWindow implements NativeWindow {
+public class NullWindow implements NativeWindow, SurfaceChangeable {
   private Exception lockedStack = null;
   protected int width, height, scrnIndex;
   protected long surfaceHandle, displayHandle;
@@ -96,17 +96,7 @@ public class NullWindow implements NativeWindow {
     return false;
   }
 
-  NativeWindow upstreamNW = null;
-
-  public void setUpstreamNativeWindow(NativeWindow upstream) {
-    upstreamNW = upstream;
-  }
-
-  public void surfaceUpdated(Object updater, NativeWindow window, long when) { 
-    if(null!=upstreamNW) {
-        upstreamNW.surfaceUpdated(updater, upstreamNW, when);
-    }
-  }
+  public void surfaceUpdated(Object updater, NativeWindow window, long when) { }
 
   public long getDisplayHandle() {
     return displayHandle;
@@ -120,8 +110,8 @@ public class NullWindow implements NativeWindow {
   public long getSurfaceHandle() {
     return surfaceHandle;
   }
-  public void setSurfaceHandle(long handle) {
-    surfaceHandle=handle;
+  public void setSurfaceHandle(long surfaceHandle) {
+    this.surfaceHandle=surfaceHandle;
   }
   public AbstractGraphicsConfiguration getGraphicsConfiguration() {
     return config;
@@ -152,8 +142,7 @@ public class NullWindow implements NativeWindow {
     return "NullWindow[config "+config+
                 ", displayHandle 0x"+Long.toHexString(getDisplayHandle())+
                 ", surfaceHandle 0x"+Long.toHexString(getSurfaceHandle())+
-                ", size "+getWidth()+"x"+getHeight()+
-                ", upstream "+upstreamNW+"]";
+                ", size "+getWidth()+"x"+getHeight()+"]";
   }
 
 }