MacOSXCGLDrawableFactory: Fix typo 'Applet' -> 'Apple' for APPLE_float_pixels

- be verbose about features in DEBUG mode (RECT, NPOT, APPLE_float_pixels)

2 files changed, 15 insertions, 8 deletions

diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java
index ee28b7bcb..c412bbe1d 100644
--- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLDrawableFactory.java
@@ -142,7 +142,7 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl {
       boolean wasContextCreated;
       boolean hasNPOTTextures;
       boolean hasRECTTextures;
-      boolean hasAppletFloatPixels;
+      boolean hasAppleFloatPixels;
 
       SharedResource(MacOSXGraphicsDevice device, boolean wasContextCreated, 
                      boolean hasNPOTTextures, boolean hasRECTTextures, boolean hasAppletFloatPixels
@@ -153,13 +153,13 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl {
           this.wasContextCreated = wasContextCreated;
           this.hasNPOTTextures = hasNPOTTextures;
           this.hasRECTTextures = hasRECTTextures;
-          this.hasAppletFloatPixels = hasAppletFloatPixels;
+          this.hasAppleFloatPixels = hasAppletFloatPixels;
       }
       final MacOSXGraphicsDevice getDevice() { return device; }
       final boolean wasContextAvailable() { return wasContextCreated; }
       final boolean isNPOTTextureAvailable() { return hasNPOTTextures; }
       final boolean isRECTTextureAvailable() { return hasRECTTextures; }
-      final boolean isAppletFloatPixelsAvailable() { return hasAppletFloatPixels; }
+      final boolean isAppleFloatPixelsAvailable() { return hasAppleFloatPixels; }
   }
 
   public final AbstractGraphicsDevice getDefaultDevice() {
@@ -203,7 +203,7 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl {
         boolean madeCurrent = false;
         boolean hasNPOTTextures = false;
         boolean hasRECTTextures = false;
-        boolean hasAppletFloatPixels = false;
+        boolean hasAppleFloatPixels = false;
         {
             GLProfile glp = GLProfile.get(sharedDevice, GLProfile.GL_PROFILE_LIST_MIN_DESKTOP);
             if (null == glp) {
@@ -228,7 +228,7 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl {
                             GL gl = context.getGL();
                             hasNPOTTextures = gl.isNPOTTextureAvailable();
                             hasRECTTextures = gl.isExtensionAvailable("GL_EXT_texture_rectangle");
-                            hasAppletFloatPixels = gl.isExtensionAvailable("GL_APPLE_float_pixels");
+                            hasAppleFloatPixels = gl.isExtensionAvailable("GL_APPLE_float_pixels");
                         }
                     } catch (GLException gle) {
                         if (DEBUG) {
@@ -249,14 +249,15 @@ public class MacOSXCGLDrawableFactory extends GLDrawableFactoryImpl {
                 drawable.destroy();
             }
         }
-        sr = new SharedResource(sharedDevice, madeCurrent, hasNPOTTextures, hasRECTTextures, hasAppletFloatPixels);
+        sr = new SharedResource(sharedDevice, madeCurrent, hasNPOTTextures, hasRECTTextures, hasAppleFloatPixels);
         synchronized(sharedMap) {
             sharedMap.put(connection, sr);
         }
         removeDeviceTried(connection);
         if (DEBUG) {
             System.err.println("MacOSXCGLDrawableFactory.createShared: device:  " + sharedDevice);
-            System.err.println("MacOSXCGLDrawableFactory.createShared: context: " + madeCurrent);
+            System.err.println("MacOSXCGLDrawableFactory.createShared: context: madeCurrent " + madeCurrent + ", NPOT "+hasNPOTTextures+
+                               ", RECT "+hasRECTTextures+", FloatPixels "+hasAppleFloatPixels);
         }                        
     }
     return sr;
diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java
index e02c3efec..1e49d1fc9 100644
--- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java
+++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXPbufferCGLDrawable.java
@@ -129,6 +129,12 @@ public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
     
     if (DEBUG) {
         System.out.println("Pbuffer config: " + config);
+        if(null != sr) {
+            System.out.println("Pbuffer NPOT Texure  avail: "+sr.isNPOTTextureAvailable());
+            System.out.println("Pbuffer RECT Texture avail: "+sr.isRECTTextureAvailable());
+        } else {
+            System.out.println("Pbuffer no sr, no RECT/NPOT Texture avail");
+        }
     }
 
     if ( capabilities.getPbufferRenderToTextureRectangle() && null!=sr && sr.isRECTTextureAvailable() ) {
@@ -146,7 +152,7 @@ public class MacOSXPbufferCGLDrawable extends MacOSXCGLDrawable {
 
     int internalFormat = GL.GL_RGBA;
     if (capabilities.getPbufferFloatingPointBuffers()) {
-      if(!glProfile.isGL2GL3() || null==sr || sr.isAppletFloatPixelsAvailable()) {
+      if(!glProfile.isGL2GL3() || null==sr || sr.isAppleFloatPixelsAvailable()) {
           throw new GLException("Floating-point support (GL_APPLE_float_pixels) not available");
       }
       switch (capabilities.getRedBits()) {