From e9ac743a4160e880202459dfed289f417988d87b Mon Sep 17 00:00:00 2001 From: Kenneth Russel Date: Sun, 14 Dec 2008 02:00:38 +0000 Subject: Fixed nested toolkit locking problem with X11PbufferGLXDrawable. With this fix pbuffers and the GLJPanel are working again on X11 platforms. Moved lockToolkit, unlockToolkit and isToolkitLocked from GLDrawableFactory to GLDrawableFactoryImpl. Updated all call sites. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1819 232f8b59-042b-4e1e-8c03-345bb8c30851 --- .../com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java') diff --git a/src/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java b/src/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java index 9289d7c02..77aa03a83 100644 --- a/src/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java +++ b/src/classes/com/sun/opengl/impl/x11/glx/X11OffscreenGLXDrawable.java @@ -70,7 +70,7 @@ public class X11OffscreenGLXDrawable extends X11GLXDrawable { XVisualInfo vis = chooseVisual(false); int bitsPerPixel = vis.depth(); - getFactory().lockToolkit(); + getFactoryImpl().lockToolkit(); try { int screen = X11Lib.DefaultScreen(dpy); nw.setScreenIndex(screen); @@ -94,7 +94,7 @@ public class X11OffscreenGLXDrawable extends X11GLXDrawable { } setChosenGLCapabilities(((X11GLXDrawableFactory)getFactory()).xvi2GLCapabilities(dpy, vis)); } finally { - getFactory().unlockToolkit(); + getFactoryImpl().unlockToolkit(); } } @@ -111,7 +111,7 @@ public class X11OffscreenGLXDrawable extends X11GLXDrawable { } // Must destroy pixmap and GLXPixmap - getFactory().lockToolkit(); + getFactoryImpl().lockToolkit(); if (DEBUG) { long cur = GLX.glXGetCurrentContext(); @@ -133,7 +133,7 @@ public class X11OffscreenGLXDrawable extends X11GLXDrawable { display = 0; setChosenGLCapabilities(null); } finally { - getFactory().unlockToolkit(); + getFactoryImpl().unlockToolkit(); } super.destroy(); } -- cgit v1.2.3