diff options
author | Sven Gothel <[email protected]> | 2001-12-16 04:03:13 +0000 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2001-12-16 04:03:13 +0000 |
commit | 1b5e56cb709f2c24b58723c54cd1dd0d2784f7c9 (patch) | |
tree | daec635be38ef24d0a40c9e2bb7eb0f9806f041b /CNativeCode/OpenGL_X11_jawt.c | |
parent | a0ba5f95da3acd54769834ed3b4c84b745004f04 (diff) |
added a temporaery workaround for
the Linux X11 NVidia Driver 2314 Bug ..
_some_ offscreen renderer features still does not work ..
Diffstat (limited to 'CNativeCode/OpenGL_X11_jawt.c')
-rw-r--r-- | CNativeCode/OpenGL_X11_jawt.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CNativeCode/OpenGL_X11_jawt.c b/CNativeCode/OpenGL_X11_jawt.c index 28f3f44..d7bd481 100644 --- a/CNativeCode/OpenGL_X11_jawt.c +++ b/CNativeCode/OpenGL_X11_jawt.c @@ -713,7 +713,9 @@ Java_gl4java_GLContext_gljMakeCurrentNative( JNIEnv *env, jobject obj, return ret; } - ctx = disp__glXGetCurrentContext(); + /** JAU NVidia 2314 Bug workaround .. + ctx = disp__glXGetCurrentContext(); + */ if(ret==JNI_TRUE && ctx!=(GLXContext)((PointerHolder)glContext) ) { @@ -866,7 +868,8 @@ Java_gl4java_GLContext_gljDestroyNative( JNIEnv *env, jobject obj, win = GET_USED_WINDOW(pData); disp = GET_USED_DISPLAY(pData); - disp__glXWaitGL(); + if(gc!=0) + disp__glXWaitGL(); if(ret==JNI_TRUE) { @@ -877,8 +880,7 @@ Java_gl4java_GLContext_gljDestroyNative( JNIEnv *env, jobject obj, fprintf(stderr, "GL4Java: gljDestroy failed, GL context is 0\n"); fflush(stderr); } - } - disp__glXMakeCurrent( disp, None, NULL ); + } else disp__glXMakeCurrent( disp, None, NULL ); if(ret==JNI_TRUE) { |