diff options
| author | Sven Gothel <[email protected]> | 2014-08-30 12:03:03 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-08-30 12:03:03 +0200 |
| commit | da16dfd39cc17687808308c386d64f6206027c00 (patch) | |
| tree | 5b870a031a97421fc3118b68fea3308ad759f493 /src/jogl/classes/jogamp/opengl/macosx | |
| parent | 011e13e22fd52d2e82697ffee6b4c9ca8f3d549a (diff) | |
Bug 1054: Revert dfb9ed47ac6d8e85f6ae5fe166e7a6e28ca8ff83: Cannot change protected field name w/o breaking backward compatibility
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/macosx')
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java index ddfa873ae..7066a6db5 100644 --- a/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java +++ b/src/jogl/classes/jogamp/opengl/macosx/cgl/MacOSXCGLContext.java @@ -726,7 +726,7 @@ public class MacOSXCGLContext extends GLContextImpl final RecursiveLock surfaceLock = ols.getLock(); if( surfaceLock.tryLock( maxwait ) ) { try { - if( MacOSXCGLContext.this.contextLock.tryLock( maxwait ) ) { + if( MacOSXCGLContext.this.lock.tryLock( maxwait ) ) { try { nsOpenGLLayer = CGL.createNSOpenGLLayer(ctx, shaderProgram, pfmt, pbuffer, texID, isOpaque, texWidth, texHeight, winWidth, winHeight); @@ -739,7 +739,7 @@ public class MacOSXCGLContext extends GLContextImpl System.err.println("NSOpenGLLayer.Attach: OK, layer "+toHexString(nsOpenGLLayer)+" w/ pbuffer "+toHexString(pbuffer)+", texID "+texID+", texSize "+lastWidth+"x"+lastHeight+", drawableHandle "+toHexString(drawable.getHandle())+" - "+getThreadName()); } } finally { - MacOSXCGLContext.this.contextLock.unlock(); + MacOSXCGLContext.this.lock.unlock(); } } } finally { |