From 47dc069104723f3d2e8d9ebdd700182e067163d0 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 17 Dec 2011 21:41:30 +0100
Subject: GLDrawableFactory*.createOffscreenDrawable(): No implicit
 setRealized(true) @ creation

GLDrawableFactory*.createOffscreenDrawable():
No implicit setRealized(true) @ creation, following deferred creation like onscreen drawables.
This allows using offscreen drawables in classes like GLCanvas, where realization is deferred due to pending valid size.
Only createGLPBuffer() realizes the offscreen pbuffer drawable immediatly to reduce the impact
on user-code.

GLDrawableFactoryImpl.createGLDrawable():
  - Simplify OffscreenLayerSurface validation and check it first regardless of the chosenCaps
    to get a chance to use pbuffer.
---
 .../jogamp/opengl/GLDrawableFactoryImpl.java       | 42 +++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java')

diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
index a40b112b1..e5f415a87 100644
--- a/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableFactoryImpl.java
@@ -134,29 +134,26 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
     GLDrawable result = null;
     adevice.lock();
     try {
-        if(chosenCaps.isOnscreen()) {
+        final OffscreenLayerSurface ols = NativeWindowFactory.getOffscreenLayerSurface(target, true);
+        if(null != ols) {
+            // layered surface -> Offscreen/PBuffer
+            final GLCapabilities chosenCapsMod = (GLCapabilities) chosenCaps.cloneMutable();
+            chosenCapsMod.setOnscreen(false);
+            chosenCapsMod.setPBuffer(canCreateGLPbuffer(adevice));
+            config.setChosenCapabilities(chosenCapsMod);
+            if(DEBUG) {
+                System.err.println("GLDrawableFactoryImpl.createGLDrawable -> OnscreenDrawable -> Offscreen-Layer: "+target);
+            }
+            if( ! ( target instanceof SurfaceChangeable ) ) {
+                throw new IllegalArgumentException("Passed NativeSurface must implement SurfaceChangeable for offscreen layered surface: "+target);
+            }
+            result = createOffscreenDrawableImpl(target);            
+        } else if(chosenCaps.isOnscreen()) {
             // onscreen
-            final OffscreenLayerSurface ols = NativeWindowFactory.getOffscreenLayerSurface(target, true);
-            if(null == ols) {
-                // traditional onscreen
-                if(DEBUG) {
-                    System.err.println("GLDrawableFactoryImpl.createGLDrawable -> OnscreenDrawable: "+target);
-                }
-                result = createOnscreenDrawableImpl(target);
-            } else {            
-                // layered surface -> offscreen/PBuffer
-                final GLCapabilities chosenCapsMod = (GLCapabilities) chosenCaps.cloneMutable();
-                chosenCapsMod.setOnscreen(false);
-                chosenCapsMod.setPBuffer(canCreateGLPbuffer(adevice));
-                config.setChosenCapabilities(chosenCapsMod);
-                if(DEBUG) {
-                    System.err.println("GLDrawableFactoryImpl.createGLDrawable -> OnscreenDrawable -> Offscreen-Layer: "+target);
-                }
-                if( ! ( target instanceof SurfaceChangeable ) ) {
-                    throw new IllegalArgumentException("Passed NativeSurface must implement SurfaceChangeable for offscreen layered surface: "+target);
-                }
-                result = createOffscreenDrawableImpl(target);
+            if(DEBUG) {
+                System.err.println("GLDrawableFactoryImpl.createGLDrawable -> OnscreenDrawable: "+target);
             }
+            result = createOnscreenDrawableImpl(target);
         } else {
             // offscreen
             if(DEBUG) {
@@ -215,6 +212,9 @@ public abstract class GLDrawableFactoryImpl extends GLDrawableFactory {
     device.lock();
     try {
         drawable = (GLDrawableImpl) createGLDrawable( createOffscreenSurfaceImpl(device, capsChosen, capsRequested, chooser, width, height) );
+        if(null != drawable) {
+            drawable.setRealized(true);
+        }
     } finally {
         device.unlock();
     }
-- 
cgit v1.2.3