From 6d57bd7717834afcd5f1dc3b60d696eda1997fe8 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 5 Nov 2011 05:51:40 +0100
Subject: Cleanup ; JAWT* version flag setting based whether

Cleanup
  - use Platform OS_TYPE
  - ..

JAWT* version flag
  - if JAWTWindow is Applet, attempt offscreenLayer if avail
  - ..
---
 src/jogl/classes/jogamp/opengl/GLDrawableImpl.java            |  3 +++
 .../classes/jogamp/opengl/GLGraphicsConfigurationUtil.java    | 11 +++++++++++
 .../classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java |  6 ++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'src/jogl/classes/jogamp')

diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java b/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java
index 58c9aaaa6..6b6ce9f9e 100644
--- a/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableImpl.java
@@ -125,7 +125,10 @@ public abstract class GLDrawableImpl implements GLDrawable {
     return surface;
   }
 
+  /** called with locked surface @ setRealized(false) */ 
   protected void destroyHandle() {}
+  
+  /** called with locked surface @ setRealized(true) or @ lockSurface(..) when surface changed */ 
   protected void updateHandle() {}
 
   public long getHandle() {
diff --git a/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java b/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java
index 318d00637..1f8ba5cc4 100644
--- a/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java
+++ b/src/jogl/classes/jogamp/opengl/GLGraphicsConfigurationUtil.java
@@ -146,6 +146,17 @@ public class GLGraphicsConfigurationUtil {
         return capsRequested;
     }
 
+    public static GLCapabilitiesImmutable fixSingleBufferGLCapabilities(GLCapabilitiesImmutable capsRequested)
+    {
+        if( capsRequested.getDoubleBuffered() ) {
+            // fix caps ..
+            GLCapabilities caps2 = (GLCapabilities) capsRequested.cloneMutable();
+            caps2.setDoubleBuffered(false); // FIXME DBLBUFOFFSCRN
+            return caps2;
+        }
+        return capsRequested;
+    }
+
     public static GLCapabilitiesImmutable fixOpaqueGLCapabilities(GLCapabilitiesImmutable capsRequested, boolean isOpaque)
     {
         GLCapabilities caps2 = null;
diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java
index 8ef642322..8cea2a550 100644
--- a/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11OnscreenGLXDrawable.java
@@ -56,14 +56,16 @@ public class X11OnscreenGLXDrawable extends X11GLXDrawable {
   }
 
   @SuppressWarnings("unused")
+  @Override
   public long getHandle() {
     if(USE_GLXWINDOW && useGLXWindow) {
         return glXWindow; 
     } 
-    return getNativeSurface().getSurfaceHandle();
+    return super.getHandle();
   }
 
   @SuppressWarnings("unused")
+  @Override
   protected void destroyHandle() {
     if(USE_GLXWINDOW && 0!=glXWindow) {
         GLX.glXDestroyWindow(getNativeSurface().getDisplayHandle(), glXWindow);
@@ -72,7 +74,7 @@ public class X11OnscreenGLXDrawable extends X11GLXDrawable {
     }
   }
 
-  /** must be locked already */
+  @Override
   protected void updateHandle() {
     if(USE_GLXWINDOW) {
         X11GLXGraphicsConfiguration config = (X11GLXGraphicsConfiguration)getNativeSurface().getGraphicsConfiguration().getNativeGraphicsConfiguration();
-- 
cgit v1.2.3