EGL/X11 DummySurfaceHook: Lock display device at creation/destruction

2 files changed, 45 insertions, 25 deletions

diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDummyUpstreamSurfaceHook.java b/src/jogl/classes/jogamp/opengl/egl/EGLDummyUpstreamSurfaceHook.java
index b172d4f35..162e7166a 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLDummyUpstreamSurfaceHook.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDummyUpstreamSurfaceHook.java
@@ -23,15 +23,20 @@ public class EGLDummyUpstreamSurfaceHook extends UpstreamSurfaceHookMutableSize
     @Override
     public final void create(ProxySurface s) {
         final EGLGraphicsDevice eglDevice = (EGLGraphicsDevice) s.getGraphicsConfiguration().getScreen().getDevice();
-        if(0 == eglDevice.getHandle()) {
-            eglDevice.open();
-            s.addUpstreamOptionBits( ProxySurface.OPT_PROXY_OWNS_UPSTREAM_DEVICE );
-        }
-        if( EGL.EGL_NO_SURFACE == s.getSurfaceHandle() ) {
-            s.setSurfaceHandle( EGLDrawableFactory.createPBufferSurfaceImpl((EGLGraphicsConfiguration)s.getGraphicsConfiguration(), 64, 64, false) );
-            s.addUpstreamOptionBits( ProxySurface.OPT_PROXY_OWNS_UPSTREAM_SURFACE );            
+        eglDevice.lock();
+        try {
+            if(0 == eglDevice.getHandle()) {
+                eglDevice.open();
+                s.addUpstreamOptionBits( ProxySurface.OPT_PROXY_OWNS_UPSTREAM_DEVICE );
+            }
+            if( EGL.EGL_NO_SURFACE == s.getSurfaceHandle() ) {
+                s.setSurfaceHandle( EGLDrawableFactory.createPBufferSurfaceImpl((EGLGraphicsConfiguration)s.getGraphicsConfiguration(), 64, 64, false) );
+                s.addUpstreamOptionBits( ProxySurface.OPT_PROXY_OWNS_UPSTREAM_SURFACE );            
+            }
+            s.addUpstreamOptionBits(ProxySurface.OPT_UPSTREAM_WINDOW_INVISIBLE);
+        } finally {
+            eglDevice.unlock();
         }
-        s.addUpstreamOptionBits(ProxySurface.OPT_UPSTREAM_WINDOW_INVISIBLE);
     }
     
     @Override
@@ -41,9 +46,14 @@ public class EGLDummyUpstreamSurfaceHook extends UpstreamSurfaceHookMutableSize
             if( EGL.EGL_NO_SURFACE == s.getSurfaceHandle() ) {
                 throw new InternalError("Owns upstream surface, but no EGL surface: "+s);
             }
-            EGL.eglDestroySurface(eglDevice.getHandle(), s.getSurfaceHandle());
-            s.setSurfaceHandle(EGL.EGL_NO_SURFACE);
-            s.clearUpstreamOptionBits( ProxySurface.OPT_PROXY_OWNS_UPSTREAM_SURFACE );
+            eglDevice.lock();
+            try {
+                EGL.eglDestroySurface(eglDevice.getHandle(), s.getSurfaceHandle());
+                s.setSurfaceHandle(EGL.EGL_NO_SURFACE);
+                s.clearUpstreamOptionBits( ProxySurface.OPT_PROXY_OWNS_UPSTREAM_SURFACE );
+            } finally {
+                eglDevice.unlock();
+            }
         }
     }
 }
diff --git a/src/nativewindow/classes/jogamp/nativewindow/x11/X11DummyUpstreamSurfaceHook.java b/src/nativewindow/classes/jogamp/nativewindow/x11/X11DummyUpstreamSurfaceHook.java
index 55a29dd5e..67a33e55c 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/x11/X11DummyUpstreamSurfaceHook.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/x11/X11DummyUpstreamSurfaceHook.java
@@ -30,19 +30,24 @@ public class X11DummyUpstreamSurfaceHook extends UpstreamSurfaceHookMutableSize
         final X11GraphicsConfiguration cfg = (X11GraphicsConfiguration) s.getGraphicsConfiguration();
         final X11GraphicsScreen screen = (X11GraphicsScreen) cfg.getScreen();
         final X11GraphicsDevice device = (X11GraphicsDevice) screen.getDevice();
-        if(0 == device.getHandle()) {
-            device.open();
-            s.addUpstreamOptionBits( ProxySurface.OPT_PROXY_OWNS_UPSTREAM_DEVICE );
-        }
-        if( 0 == s.getSurfaceHandle() ) {
-            final long windowHandle = X11Lib.CreateDummyWindow(device.getHandle(), screen.getIndex(), cfg.getXVisualID(), 64, 64);
-            if(0 == windowHandle) {
-                throw new NativeWindowException("Creating dummy window failed w/ "+cfg);
+        device.lock();
+        try {
+            if(0 == device.getHandle()) {
+                device.open();
+                s.addUpstreamOptionBits( ProxySurface.OPT_PROXY_OWNS_UPSTREAM_DEVICE );
+            }
+            if( 0 == s.getSurfaceHandle() ) {
+                final long windowHandle = X11Lib.CreateDummyWindow(device.getHandle(), screen.getIndex(), cfg.getXVisualID(), 64, 64);
+                if(0 == windowHandle) {
+                    throw new NativeWindowException("Creating dummy window failed w/ "+cfg);
+                }
+                s.setSurfaceHandle(windowHandle);
+                s.addUpstreamOptionBits( ProxySurface.OPT_PROXY_OWNS_UPSTREAM_SURFACE );            
             }
-            s.setSurfaceHandle(windowHandle);
-            s.addUpstreamOptionBits( ProxySurface.OPT_PROXY_OWNS_UPSTREAM_SURFACE );            
+            s.addUpstreamOptionBits(ProxySurface.OPT_UPSTREAM_WINDOW_INVISIBLE);
+        } finally {
+            device.unlock();
         }
-        s.addUpstreamOptionBits(ProxySurface.OPT_UPSTREAM_WINDOW_INVISIBLE);
     }
     
     @Override
@@ -52,9 +57,14 @@ public class X11DummyUpstreamSurfaceHook extends UpstreamSurfaceHookMutableSize
             if( 0 == s.getSurfaceHandle() ) {
                 throw new InternalError("Owns upstream surface, but no X11 window: "+s);
             }
-            X11Lib.DestroyDummyWindow(device.getHandle(), s.getSurfaceHandle());            
-            s.setSurfaceHandle(0);
-            s.clearUpstreamOptionBits( ProxySurface.OPT_PROXY_OWNS_UPSTREAM_SURFACE );
+            device.lock();
+            try {
+                X11Lib.DestroyDummyWindow(device.getHandle(), s.getSurfaceHandle());            
+                s.setSurfaceHandle(0);
+                s.clearUpstreamOptionBits( ProxySurface.OPT_PROXY_OWNS_UPSTREAM_SURFACE );
+            } finally {
+                device.unlock();
+            }
         }
     }
 }