From b3420aeb07f9bef1e4fe5f436524d0b3d66cfaa2 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 16 Nov 2010 10:30:04 +0100
Subject: X11: Make X11 error handler quiet where we expect an X11 error, ie
 OpenGL 4 not available ..

---
 .../com/jogamp/opengl/impl/x11/glx/X11GLXContext.java        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/jogl/classes')

diff --git a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
index 75e523cbc..63b758da3 100644
--- a/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/impl/x11/glx/X11GLXContext.java
@@ -240,11 +240,11 @@ public abstract class X11GLXContext extends GLContextImpl {
 
   protected boolean createImpl() {
       // covers the whole context creation loop incl createContextARBImpl and destroyContextARBImpl
-      X11Util.setX11ErrorHandler(true);
+      X11Util.setX11ErrorHandler(true, true);
       try {
           return createImplRaw();
       } finally {
-          X11Util.setX11ErrorHandler(false);
+          X11Util.setX11ErrorHandler(false, false);
       }
   }
 
@@ -380,13 +380,13 @@ public abstract class X11GLXContext extends GLContextImpl {
     long dpy = drawable.getNativeSurface().getDisplayHandle();
 
     if (GLX.glXGetCurrentContext() != contextHandle) {
-        X11Util.setX11ErrorHandler(true);
+        X11Util.setX11ErrorHandler(true, true);
         try {
             if (!glXMakeContextCurrent(dpy, drawable.getHandle(), drawableRead.getHandle(), contextHandle)) {
                 throw new GLException("Error making context current: "+this);
             }
         } finally {
-            X11Util.setX11ErrorHandler(false);
+            X11Util.setX11ErrorHandler(false, false);
         }
         if (DEBUG && (VERBOSE || newCreated)) {
             System.err.println(getThreadName() + ": glXMakeCurrent(display " + 
@@ -400,13 +400,13 @@ public abstract class X11GLXContext extends GLContextImpl {
 
   protected void releaseImpl() throws GLException {
     long display = drawable.getNativeSurface().getDisplayHandle();
-    X11Util.setX11ErrorHandler(true);
+    X11Util.setX11ErrorHandler(true, true);
     try {
         if (!glXMakeContextCurrent(display, 0, 0, 0)) {
             throw new GLException("Error freeing OpenGL context");
         }
     } finally {
-        X11Util.setX11ErrorHandler(false);
+        X11Util.setX11ErrorHandler(false, false);
     }
   }
 
-- 
cgit v1.2.3