diff options
| author | Sven Gothel <sgothel@jausoft.com> | 2011-02-22 07:40:23 +0100 |
|---|---|---|
| committer | Sven Gothel <sgothel@jausoft.com> | 2011-02-22 07:40:23 +0100 |
| commit | bb3d3743b4800d006457c767a00436b9308da75d (patch) | |
| tree | fd687329fbcb7a53eab9aa1d9735f9eac7c6d22e /src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java | |
| parent | bff7e97c2f22673bb0457765696fb867d3e4f69d (diff) | |
NativeWindow ProxySurface Abstraction and lock/unlock Surface cleanup
- ProxySurface -> abstract javax.media.nativewindow.ProxySurface,
implemented by
jogamp.nativewindow.WrappedSurface, just wrapping surface handle
jogamp.nativewindow.windows.GDISurface, using HWND and get/release HDC on lock/unlock
- Unifying NativeSurface's lockSurface/unlockSurface implementations
- NEWT's WindowImpl
- NativeWindow's ProxySurface, WrappedWindow, GDIWindow and JAWTWindow
- wingdi/GDI: Add 'WindowFromDC' and 'GetClientRect' to GDI
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java')
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java index e0ee8ea73..af055913d 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXExternalCGLContext.java @@ -44,10 +44,9 @@ import javax.media.opengl.*; import jogamp.opengl.*; import javax.media.nativewindow.*; -import jogamp.nativewindow.ProxySurface; +import jogamp.nativewindow.WrappedSurface; public class MacOSXExternalCGLContext extends MacOSXCGLContext { - private boolean firstMakeCurrent = true; private GLContext lastContext; private MacOSXExternalCGLContext(Drawable drawable, boolean isNSContext, long handle) { @@ -100,7 +99,7 @@ public class MacOSXExternalCGLContext extends MacOSXCGLContext { AbstractGraphicsScreen aScreen = DefaultGraphicsScreen.createDefault(NativeWindowFactory.TYPE_MACOSX); MacOSXCGLGraphicsConfiguration cfg = new MacOSXCGLGraphicsConfiguration(aScreen, caps, caps, pixelFormat); - ProxySurface ns = new ProxySurface(cfg); + WrappedSurface ns = new WrappedSurface(cfg); ns.setSurfaceHandle(currentDrawable); return new MacOSXExternalCGLContext(new Drawable(factory, ns), isNSContext, contextHandle); } @@ -127,9 +126,6 @@ public class MacOSXExternalCGLContext extends MacOSXCGLContext { } protected void makeCurrentImpl(boolean newCreated) throws GLException { - if (firstMakeCurrent) { - firstMakeCurrent = false; - } } protected void releaseImpl() throws GLException { |