aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--resources/clgl-if.cfg3
-rw-r--r--src/com/jogamp/opencl/gl/CLGLContext.java50
-rw-r--r--test/com/jogamp/opencl/gl/CLGLTest.java12
3 files changed, 34 insertions, 31 deletions
diff --git a/resources/clgl-if.cfg b/resources/clgl-if.cfg
index e21005d4..1671f76c 100644
--- a/resources/clgl-if.cfg
+++ b/resources/clgl-if.cfg
@@ -19,5 +19,8 @@ Extends CLGL CL
#only include token starting with CL_GL_ and methods containing GL
IgnoreNot CL_GL_.*|cl.*GL.*|.*_GL_.*
+CustomJavaCode CLGL /** To be used on Mac OSX instead of {@link #CL_CGL_SHAREGROUP_KHR}}. FIXME: For all Mac OSX versions? */
+CustomJavaCode CLGL public static final int CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE = 0x10000000;
+
#append to generated c files
#CustomCCode #include <inttypes.h>
diff --git a/src/com/jogamp/opencl/gl/CLGLContext.java b/src/com/jogamp/opencl/gl/CLGLContext.java
index 005e9614..e99e7ac4 100644
--- a/src/com/jogamp/opencl/gl/CLGLContext.java
+++ b/src/com/jogamp/opencl/gl/CLGLContext.java
@@ -28,22 +28,23 @@
package com.jogamp.opencl.gl;
-import com.jogamp.opencl.llb.gl.CLGL;
-import com.jogamp.opencl.CLContext;
-import com.jogamp.opencl.CLDevice;
import java.nio.Buffer;
-import com.jogamp.opencl.CLMemory.Mem;
-import com.jogamp.opencl.CLPlatform;
-import com.jogamp.common.nio.PointerBuffer;
+
+import javax.media.opengl.GLContext;
+
import jogamp.opengl.GLContextImpl;
import jogamp.opengl.egl.EGLContext;
-import jogamp.opengl.macosx.cgl.MacOSXCGLContext;
import jogamp.opengl.macosx.cgl.CGL;
+import jogamp.opengl.macosx.cgl.MacOSXCGLContext;
import jogamp.opengl.windows.wgl.WindowsWGLContext;
import jogamp.opengl.x11.glx.X11GLXContext;
-import javax.media.opengl.GLContext;
-import static com.jogamp.opencl.llb.gl.CLGL.*;
+import com.jogamp.common.nio.PointerBuffer;
+import com.jogamp.opencl.CLContext;
+import com.jogamp.opencl.CLDevice;
+import com.jogamp.opencl.CLMemory.Mem;
+import com.jogamp.opencl.CLPlatform;
+import com.jogamp.opencl.llb.gl.CLGL;
/**
* OpenCL Context supporting JOGL-JOCL interoperablity.
@@ -162,9 +163,9 @@ public final class CLGLContext extends CLContext {
// create the OpenGL context."
properties = PointerBuffer.allocateDirect(7);
long displayHandle = ctxImpl.getDrawableImpl().getNativeSurface().getDisplayHandle();
- properties.put(CL_GL_CONTEXT_KHR).put(glID[0])
- .put(CL_GLX_DISPLAY_KHR).put(displayHandle)
- .put(CL_CONTEXT_PLATFORM).put(platform.ID);
+ properties.put(CLGL.CL_GL_CONTEXT_KHR).put(glID[0])
+ .put(CLGL.CL_GLX_DISPLAY_KHR).put(displayHandle)
+ .put(CLGL.CL_CONTEXT_PLATFORM).put(platform.ID);
}else if(glContext instanceof WindowsWGLContext) {
// spec: "When the WGL binding API is supported, the attribute
// CL_GL_CONTEXT_KHR should be set to an HGLRC handle to an OpenGL
@@ -172,18 +173,25 @@ public final class CLGLContext extends CLContext {
// HDC handle of the display used to create the OpenGL context."
properties = PointerBuffer.allocateDirect(7);
long surfaceHandle = ctxImpl.getDrawableImpl().getNativeSurface().getSurfaceHandle();
- properties.put(CL_GL_CONTEXT_KHR).put(glID[0])
- .put(CL_WGL_HDC_KHR).put(surfaceHandle)
- .put(CL_CONTEXT_PLATFORM).put(platform.ID);
+ properties.put(CLGL.CL_GL_CONTEXT_KHR).put(glID[0])
+ .put(CLGL.CL_WGL_HDC_KHR).put(surfaceHandle)
+ .put(CLGL.CL_CONTEXT_PLATFORM).put(platform.ID);
}else if(glContext instanceof MacOSXCGLContext) {
// spec: "When the CGL binding API is supported, the attribute
// CL_CGL_SHAREGROUP_KHR should be set to a CGLShareGroup handle to
// a CGL share group object."
+ /**
+ * FIXME: For all Mac OSX Versions ???
+ * CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE used to specify the GL sharing group ID
+ * on Mac OSX 10.8.4 works.
+ * Using the std. CL_CGL_SHAREGROUP_KHR on Mac OSX 10.8.4 causes the context creation
+ * to throw a CL_INVALID_VALUE error.
+ */
long cgl = CGL.getCGLContext(glID[0]);
long group = CGL.CGLGetShareGroup(cgl);
properties = PointerBuffer.allocateDirect(5);
- properties.put(268435456).put(group) // CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE
- .put(CL_CONTEXT_PLATFORM).put(platform.ID);
+ properties.put(CLGL.CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE).put(group)
+ .put(CLGL.CL_CONTEXT_PLATFORM).put(platform.ID);
}else if(glContext instanceof EGLContext) {
// TODO test EGL
// spec: "When the EGL binding API is supported, the attribute
@@ -193,16 +201,16 @@ public final class CLGLContext extends CLContext {
// display used to create the OpenGL ES or OpenGL context."
properties = PointerBuffer.allocateDirect(7);
long displayHandle = ctxImpl.getDrawableImpl().getNativeSurface().getDisplayHandle();
- properties.put(CL_GL_CONTEXT_KHR).put(glID[0])
- .put(CL_EGL_DISPLAY_KHR).put(displayHandle)
- .put(CL_CONTEXT_PLATFORM).put(platform.ID);
+ properties.put(CLGL.CL_GL_CONTEXT_KHR).put(glID[0])
+ .put(CLGL.CL_EGL_DISPLAY_KHR).put(displayHandle)
+ .put(CLGL.CL_CONTEXT_PLATFORM).put(platform.ID);
}else{
throw new RuntimeException("unsupported GLContext: "+glContext);
}
return properties.put(0).rewind(); // 0 terminated array
}
-
+
// Buffers
/**
* Creates a CLGLBuffer for memory sharing with the specified OpenGL buffer.
diff --git a/test/com/jogamp/opencl/gl/CLGLTest.java b/test/com/jogamp/opencl/gl/CLGLTest.java
index 75cd35c2..5ccebb1a 100644
--- a/test/com/jogamp/opencl/gl/CLGLTest.java
+++ b/test/com/jogamp/opencl/gl/CLGLTest.java
@@ -37,9 +37,7 @@ import com.jogamp.opencl.CLCommandQueue;
import javax.media.opengl.GL2;
import javax.media.opengl.GLException;
import com.jogamp.opencl.CLDevice;
-import com.jogamp.newt.Display;
import com.jogamp.newt.NewtFactory;
-import com.jogamp.newt.Screen;
import com.jogamp.newt.Window;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.opencl.CLContext;
@@ -51,10 +49,7 @@ import java.nio.IntBuffer;
import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLProfile;
import javax.media.opengl.GLContext;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.MethodRule;
-import org.junit.rules.Timeout;
import static com.jogamp.opencl.util.CLPlatformFilters.*;
import static org.junit.Assert.*;
@@ -66,9 +61,6 @@ import static java.lang.System.*;
*/
public class CLGLTest {
- @Rule
- public MethodRule methodTimeout= new Timeout(15000);
-
private static GLContext glcontext;
private static GLWindow glWindow;
private static Window window;
@@ -101,7 +93,7 @@ public class CLGLTest {
window = null;
}
- @Test
+ @Test(timeout=15000)
public void createContextTest() {
initGL();
@@ -143,7 +135,7 @@ public class CLGLTest {
}
- @Test
+ @Test(timeout=15000)
public void vboSharing() {
out.println(" - - - glcl; vboSharing - - - ");
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 18:38:33 +0000