1 files changed, 5 insertions, 35 deletions
diff --git a/src/jogl/native/macosx/MacOSXWindowSystemInterface.m b/src/jogl/native/macosx/MacOSXWindowSystemInterface.m
index f774f8f4a..becd41bb2 100644
--- a/src/jogl/native/macosx/MacOSXWindowSystemInterface.m
+++ b/src/jogl/native/macosx/MacOSXWindowSystemInterface.m
@@ -696,6 +696,11 @@ void setContextTextureImageToPBuffer(NSOpenGLContext* ctx, NSOpenGLPixelBuffer*
   [pool release];
 }
 
+Bool isNSOpenGLPixelBuffer(uint64_t object) {
+  NSObject *nsObj = (NSObject*) (intptr_t) object;
+  return [nsObj isMemberOfClass:[NSOpenGLPixelBuffer class]];
+}
+
 #include <mach-o/dyld.h>
 Bool imagesInitialized = false;
 static char libGLStr[] = "/System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib";
@@ -746,38 +751,3 @@ void resetGammaRamp() {
   CGDisplayRestoreColorSyncSettings();
 }
 
-/***
- * The following static functions are copied out of NEWT's OSX impl. <src/newt/native/MacWindow.m>
- * May need to push code to NativeWindow, to remove duplication.
- */
-static NSScreen * NewtScreen_getNSScreenByIndex(int screen_idx) {
-    NSArray *screens = [NSScreen screens];
-    if(screen_idx<0) screen_idx=0;
-    if(screen_idx>=[screens count]) screen_idx=0;
-    return (NSScreen *) [screens objectAtIndex: screen_idx];
-}
-static CGDirectDisplayID NewtScreen_getCGDirectDisplayIDByNSScreen(NSScreen *screen) {
-    // Mind: typedef uint32_t CGDirectDisplayID; - however, we assume it's 64bit on 64bit ?!
-    NSDictionary * dict = [screen deviceDescription];
-    NSNumber * val = (NSNumber *) [dict objectForKey: @"NSScreenNumber"];
-    // [NSNumber integerValue] returns NSInteger which is 32 or 64 bit native size
-    return (CGDirectDisplayID) [val integerValue];
-}
-static long GetDictionaryLong(CFDictionaryRef theDict, const void* key) 
-{
-    long value = 0;
-    CFNumberRef numRef;
-    numRef = (CFNumberRef)CFDictionaryGetValue(theDict, key); 
-    if (numRef != NULL)
-        CFNumberGetValue(numRef, kCFNumberLongType, &value);    
-    return value;
-}
-#define CGDDGetModeRefreshRate(mode) GetDictionaryLong((mode), kCGDisplayRefreshRate)
-
-int getScreenRefreshRate(int scrn_idx) {
-    NSScreen *screen = NewtScreen_getNSScreenByIndex(scrn_idx);
-    CGDirectDisplayID display = NewtScreen_getCGDirectDisplayIDByNSScreen(screen);
-    CFDictionaryRef mode = CGDisplayCurrentMode(display);
-    return CGDDGetModeRefreshRate(mode);
-}
-