From d40f97c1ecb7de88e6093f54aa9d38e23b091be0 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sun, 21 Nov 2010 21:22:39 +0100
Subject: CLGLContext.create() no longer makes the glcontext current.

---
 src/com/jogamp/opencl/gl/CLGLContext.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/com/jogamp/opencl/gl/CLGLContext.java')

diff --git a/src/com/jogamp/opencl/gl/CLGLContext.java b/src/com/jogamp/opencl/gl/CLGLContext.java
index ac1e5da7..1c6069b9 100644
--- a/src/com/jogamp/opencl/gl/CLGLContext.java
+++ b/src/com/jogamp/opencl/gl/CLGLContext.java
@@ -120,7 +120,10 @@ public final class CLGLContext extends CLContext {
         }
 
         // context must be current
-        glContext.makeCurrent();
+        if(!glContext.isCurrent()) {
+            throw new IllegalArgumentException("OpenGL context is not current,\n"+
+                    " creating a OpenCL context for context sharing is not allowed in this situation.");
+        }
 
         GLContextImpl ctxImpl = (GLContextImpl)glContext;
         glID[0] = glContext.getHandle();
-- 
cgit v1.2.3