diff options
author | Sven Gothel <sgothel@jausoft.com> | 2014-06-08 07:23:14 +0200 |
---|---|---|
committer | Sven Gothel <sgothel@jausoft.com> | 2014-06-08 07:23:14 +0200 |
commit | 64518911395ee9698a326f4ca01b2ad28dabf673 (patch) | |
tree | 1e22acaf79a9b90661cb451e7e27a8a884e4898d /src/jogl/classes | |
parent | ebe980ad6ac40148bc84913d1ba1f7adf6200490 (diff) |
UpstreamSurfaceHook: Add 'NativeSurface getUpstreamSurface()' (from EGLUpstreamSurfaceHook) to generalize ProxySurfaceImpl.getUpstreamSurface()
Diffstat (limited to 'src/jogl/classes')
3 files changed, 21 insertions, 7 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/swt/GLCanvas.java b/src/jogl/classes/com/jogamp/opengl/swt/GLCanvas.java index ec0935c18..fbe5fedc4 100644 --- a/src/jogl/classes/com/jogamp/opengl/swt/GLCanvas.java +++ b/src/jogl/classes/com/jogamp/opengl/swt/GLCanvas.java @@ -468,6 +468,17 @@ public class GLCanvas extends Canvas implements GLAutoDrawable, GLSharedContextS public String toString() { return "SWTCanvasUpstreamSurfaceHook[upstream: "+GLCanvas.this.toString()+", "+clientArea.width+"x"+clientArea.height+"]"; } + + /** + * {@inheritDoc} + * <p> + * Returns <code>null</code>. + * </p> + */ + @Override + public final NativeSurface getUpstreamSurface() { + return null; + } }; protected final void updateSizeCheck() { diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLUpstreamSurfaceHook.java b/src/jogl/classes/jogamp/opengl/egl/EGLUpstreamSurfaceHook.java index d0dc79437..052872122 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLUpstreamSurfaceHook.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLUpstreamSurfaceHook.java @@ -17,7 +17,7 @@ import com.jogamp.nativewindow.egl.EGLGraphicsDevice; * <pre> * EGLWrappedSurface [ is_a -> WrappedSurface -> ProxySurfaceImpl -> ProxySurface -> MutableSurface -> NativeSurface] has_a * EGLUpstreamSurfaceHook [ is_a -> UpstreamSurfaceHook.MutableSize -> UpstreamSurfaceHook ] has_a - * NativeSurface (i.e. native X11 surface) + * NativeSurface (e.g. native X11 surface) * </pre> */ public class EGLUpstreamSurfaceHook implements UpstreamSurfaceHook.MutableSize { @@ -40,10 +40,17 @@ public class EGLUpstreamSurfaceHook implements UpstreamSurfaceHook.MutableSize { } } - public final NativeSurface getUpstreamSurface() { return upstreamSurface; } - static String getThreadName() { return Thread.currentThread().getName(); } + /** + * {@inheritDoc} + * <p> + * Returns the actual upstream {@link NativeSurface}, e.g. native X11 surface. + * </p> + */ + @Override + public final NativeSurface getUpstreamSurface() { return upstreamSurface; } + @Override public final void setSurfaceSize(int width, int height) { if(null != upstreamSurfaceHookMutableSize) { diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLWrappedSurface.java b/src/jogl/classes/jogamp/opengl/egl/EGLWrappedSurface.java index e6d43d957..4a5113b51 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLWrappedSurface.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLWrappedSurface.java @@ -27,8 +27,4 @@ public class EGLWrappedSurface extends WrappedSurface { } } - @Override - public final NativeSurface getUpstreamSurface() { - return ((EGLUpstreamSurfaceHook)super.getUpstreamSurfaceHook()).getUpstreamSurface(); - } } |