aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/jogamp/opencl/gl
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/jogamp/opencl/gl')
-rw-r--r--src/com/jogamp/opencl/gl/CLGLContext.java9
-rw-r--r--src/com/jogamp/opencl/gl/CLGLImage2d.java7
-rw-r--r--src/com/jogamp/opencl/gl/CLGLTexture2d.java7
-rw-r--r--src/com/jogamp/opencl/gl/CLGLTexture3d.java9
4 files changed, 14 insertions, 18 deletions
diff --git a/src/com/jogamp/opencl/gl/CLGLContext.java b/src/com/jogamp/opencl/gl/CLGLContext.java
index befa9158..e1d7d0ce 100644
--- a/src/com/jogamp/opencl/gl/CLGLContext.java
+++ b/src/com/jogamp/opencl/gl/CLGLContext.java
@@ -45,7 +45,6 @@ import com.jogamp.opencl.CLDevice;
import com.jogamp.opencl.CLMemory.Mem;
import com.jogamp.opencl.CLPlatform;
import com.jogamp.opencl.llb.CL;
-import com.jogamp.opencl.llb.CLContextBinding;
import com.jogamp.opencl.llb.gl.CLGL;
/**
@@ -167,7 +166,7 @@ public final class CLGLContext extends CLContext {
final long displayHandle = ctxImpl.getDrawableImpl().getNativeSurface().getDisplayHandle();
properties.put(CLGL.CL_GL_CONTEXT_KHR).put(glID[0])
.put(CL.CL_GLX_DISPLAY_KHR).put(displayHandle)
- .put(CLContextBinding.CL_CONTEXT_PLATFORM).put(platform.ID);
+ .put(CL.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
@@ -177,7 +176,7 @@ public final class CLGLContext extends CLContext {
final long surfaceHandle = ctxImpl.getDrawableImpl().getNativeSurface().getSurfaceHandle();
properties.put(CLGL.CL_GL_CONTEXT_KHR).put(glID[0])
.put(CL.CL_WGL_HDC_KHR).put(surfaceHandle)
- .put(CLContextBinding.CL_CONTEXT_PLATFORM).put(platform.ID);
+ .put(CL.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
@@ -193,7 +192,7 @@ public final class CLGLContext extends CLContext {
final long group = CGL.CGLGetShareGroup(cgl);
properties = PointerBuffer.allocateDirect(5);
properties.put(CLGL.CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE).put(group)
- .put(CLContextBinding.CL_CONTEXT_PLATFORM).put(platform.ID);
+ .put(CL.CL_CONTEXT_PLATFORM).put(platform.ID);
}else if(glContext instanceof EGLContext) {
// TODO test EGL
// spec: "When the EGL binding API is supported, the attribute
@@ -205,7 +204,7 @@ public final class CLGLContext extends CLContext {
final long displayHandle = ctxImpl.getDrawableImpl().getNativeSurface().getDisplayHandle();
properties.put(CLGL.CL_GL_CONTEXT_KHR).put(glID[0])
.put(CL.CL_EGL_DISPLAY_KHR).put(displayHandle)
- .put(CLContextBinding.CL_CONTEXT_PLATFORM).put(platform.ID);
+ .put(CL.CL_CONTEXT_PLATFORM).put(platform.ID);
}else{
throw new RuntimeException("unsupported GLContext: "+glContext);
}
diff --git a/src/com/jogamp/opencl/gl/CLGLImage2d.java b/src/com/jogamp/opencl/gl/CLGLImage2d.java
index 93c0bc3a..67616542 100644
--- a/src/com/jogamp/opencl/gl/CLGLImage2d.java
+++ b/src/com/jogamp/opencl/gl/CLGLImage2d.java
@@ -29,7 +29,6 @@
package com.jogamp.opencl.gl;
import com.jogamp.opencl.llb.CL;
-import com.jogamp.opencl.llb.CLImageBinding;
import com.jogamp.opencl.llb.gl.CLGL;
import com.jogamp.opencl.CLContext;
import com.jogamp.opencl.CLException;
@@ -75,10 +74,10 @@ public class CLGLImage2d<B extends Buffer> extends CLImage2d<B> implements CLGLO
final CLImageInfoAccessor accessor = new CLImageInfoAccessor(getCL(context), id);
final CLImageFormat format = createUninitializedImageFormat();
- accessor.getInfo(CLImageBinding.CL_IMAGE_FORMAT, CLImageFormatImpl.size(), format.getFormatImpl().getBuffer(), null);
+ accessor.getInfo(CL.CL_IMAGE_FORMAT, CLImageFormatImpl.size(), format.getFormatImpl().getBuffer(), null);
- final int width = (int)accessor.getLong(CLImageBinding.CL_IMAGE_WIDTH);
- final int height = (int)accessor.getLong(CLImageBinding.CL_IMAGE_HEIGHT);
+ final int width = (int)accessor.getLong(CL.CL_IMAGE_WIDTH);
+ final int height = (int)accessor.getLong(CL.CL_IMAGE_HEIGHT);
return new CLGLImage2d<B>(context, directBuffer, format, accessor, width, height, id, glObject, flags);
}
diff --git a/src/com/jogamp/opencl/gl/CLGLTexture2d.java b/src/com/jogamp/opencl/gl/CLGLTexture2d.java
index 30b8164e..9b68e524 100644
--- a/src/com/jogamp/opencl/gl/CLGLTexture2d.java
+++ b/src/com/jogamp/opencl/gl/CLGLTexture2d.java
@@ -29,7 +29,6 @@
package com.jogamp.opencl.gl;
import com.jogamp.opencl.llb.CL;
-import com.jogamp.opencl.llb.CLImageBinding;
import com.jogamp.opencl.CLContext;
import com.jogamp.opencl.CLException;
import com.jogamp.opencl.CLImageFormat;
@@ -68,10 +67,10 @@ public class CLGLTexture2d<B extends Buffer> extends CLGLImage2d<B> implements C
final CLImageInfoAccessor accessor = new CLImageInfoAccessor(cl, id);
final CLImageFormat format = createUninitializedImageFormat();
- accessor.getInfo(CLImageBinding.CL_IMAGE_FORMAT, CLImageFormatImpl.size(), format.getFormatImpl().getBuffer(), null);
+ accessor.getInfo(CL.CL_IMAGE_FORMAT, CLImageFormatImpl.size(), format.getFormatImpl().getBuffer(), null);
- final int width = (int)accessor.getLong(CLImageBinding.CL_IMAGE_WIDTH);
- final int height = (int)accessor.getLong(CLImageBinding.CL_IMAGE_HEIGHT);
+ final int width = (int)accessor.getLong(CL.CL_IMAGE_WIDTH);
+ final int height = (int)accessor.getLong(CL.CL_IMAGE_HEIGHT);
return new CLGLTexture2d<B>(context, directBuffer, format, accessor, target, mipLevel, width, height, id, texture, flags);
diff --git a/src/com/jogamp/opencl/gl/CLGLTexture3d.java b/src/com/jogamp/opencl/gl/CLGLTexture3d.java
index 2b389252..24893dd1 100644
--- a/src/com/jogamp/opencl/gl/CLGLTexture3d.java
+++ b/src/com/jogamp/opencl/gl/CLGLTexture3d.java
@@ -30,7 +30,6 @@ package com.jogamp.opencl.gl;
import com.jogamp.opencl.llb.gl.CLGL;
import com.jogamp.opencl.llb.CL;
-import com.jogamp.opencl.llb.CLImageBinding;
import com.jogamp.opencl.CLContext;
import com.jogamp.opencl.CLException;
import com.jogamp.opencl.CLImage3d;
@@ -77,11 +76,11 @@ public class CLGLTexture3d<B extends Buffer> extends CLImage3d<B> implements CLG
final CLImageInfoAccessor accessor = new CLImageInfoAccessor(cl, id);
final CLImageFormat format = createUninitializedImageFormat();
- accessor.getInfo(CLImageBinding.CL_IMAGE_FORMAT, CLImageFormatImpl.size(), format.getFormatImpl().getBuffer(), null);
+ accessor.getInfo(CL.CL_IMAGE_FORMAT, CLImageFormatImpl.size(), format.getFormatImpl().getBuffer(), null);
- final int width = (int)accessor.getLong(CLImageBinding.CL_IMAGE_WIDTH);
- final int height = (int)accessor.getLong(CLImageBinding.CL_IMAGE_HEIGHT);
- final int depth = (int)accessor.getLong(CLImageBinding.CL_IMAGE_DEPTH);
+ final int width = (int)accessor.getLong(CL.CL_IMAGE_WIDTH);
+ final int height = (int)accessor.getLong(CL.CL_IMAGE_HEIGHT);
+ final int depth = (int)accessor.getLong(CL.CL_IMAGE_DEPTH);
return new CLGLTexture3d<B>(context, directBuffer, format, accessor, target, mipLevel, width, height, depth, id, texture, flags);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 02:47:55 +0000