summaryrefslogtreecommitdiffstats
path: root/src/classes
diff options
context:
space:
mode:
authorKenneth Russel <kbrussel@alum.mit.edu>2006-05-16 06:00:13 +0000
committerKenneth Russel <kbrussel@alum.mit.edu>2006-05-16 06:00:13 +0000
commitcdfde96b30b6dea8b7dcc6a8b675de967cd58164 (patch)
tree7fd5e07e2f83330435705ecd922a557a2820de57 /src/classes
parentb9a0df16371352adc91071d6af8979a70a28f5af (diff)
Fixed another deadlock caused by introduction of FBO support in
Java2D/JOGL bridge git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@767 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/classes')
-rwxr-xr-xsrc/classes/com/sun/opengl/impl/Java2D.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/classes/com/sun/opengl/impl/Java2D.java b/src/classes/com/sun/opengl/impl/Java2D.java
index bf3219b77..3d14f3003 100755
--- a/src/classes/com/sun/opengl/impl/Java2D.java
+++ b/src/classes/com/sun/opengl/impl/Java2D.java
@@ -205,6 +205,16 @@ public class Java2D {
checkActive();
try {
+ // FIXME: this may need adjustment
+ // This seems to be needed in many applications which don't
+ // initialize an OpenGL context before this and which would
+ // otherwise cause initFBOShareContext to be called from the
+ // Queue Flusher Thread, which isn't allowed
+ initFBOShareContext(GraphicsEnvironment.
+ getLocalGraphicsEnvironment().
+ getDefaultScreenDevice().
+ getDefaultConfiguration());
+
GLDrawableFactoryImpl.getFactoryImpl().lockAWTForJava2D();
try {
invokeWithOGLContextCurrentMethod.invoke(null, new Object[] {g, r});