diff options
| author | Lixo Man <[email protected]> | 2013-09-04 13:57:09 -0300 |
|---|---|---|
| committer | Lixo Man <[email protected]> | 2013-09-04 13:57:09 -0300 |
| commit | 7b21b5abb6373637eeeb270de05bb7472f70b853 (patch) | |
| tree | 704302916f13e72b53e26a4e652b4738b2033ba9 | |
| parent | 717acaa8dc760ce17908ba3d3f06b4f26c1cac6f (diff) | |
Fixing some argument order issues; fixing creation of CLContext on Mac OS X with GLContext sharing.
| -rw-r--r-- | src/com/jogamp/opencl/CLCommandQueue.java | 4 | ||||
| -rw-r--r-- | src/com/jogamp/opencl/gl/CLGLContext.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/jogamp/opencl/CLCommandQueue.java b/src/com/jogamp/opencl/CLCommandQueue.java index 2e21ca07..7334f0cb 100644 --- a/src/com/jogamp/opencl/CLCommandQueue.java +++ b/src/com/jogamp/opencl/CLCommandQueue.java @@ -1036,7 +1036,7 @@ public class CLCommandQueue extends CLObjectResource { copy2NIO(ibA, srcOriginX, srcOriginY, 0); copy2NIO(ibB, rangeX, rangeY, 1); - int ret = cl.clEnqueueCopyImageToBuffer(ID, dstBuffer.ID, srcImage.ID, + int ret = cl.clEnqueueCopyImageToBuffer(ID, srcImage.ID, dstBuffer.ID, ibA, ibB, dstOffset, conditions, conditionIDs, events==null ? null : events.IDs); if(ret != CL_SUCCESS) { @@ -1101,7 +1101,7 @@ public class CLCommandQueue extends CLObjectResource { copy2NIO(ibA, srcOriginX, srcOriginY, srcOriginZ); copy2NIO(ibB, rangeX, rangeY, rangeZ); - int ret = cl.clEnqueueCopyImageToBuffer(ID, dstBuffer.ID, srcImage.ID, + int ret = cl.clEnqueueCopyImageToBuffer(ID, srcImage.ID, dstBuffer.ID, ibA, ibB, dstOffset, conditions, conditionIDs, events==null ? null : events.IDs); if(ret != CL_SUCCESS) { diff --git a/src/com/jogamp/opencl/gl/CLGLContext.java b/src/com/jogamp/opencl/gl/CLGLContext.java index 6194d88b..005e9614 100644 --- a/src/com/jogamp/opencl/gl/CLGLContext.java +++ b/src/com/jogamp/opencl/gl/CLGLContext.java @@ -182,7 +182,7 @@ public final class CLGLContext extends CLContext { long cgl = CGL.getCGLContext(glID[0]); long group = CGL.CGLGetShareGroup(cgl); properties = PointerBuffer.allocateDirect(5); - properties.put(CL_CGL_SHAREGROUP_KHR).put(group) + properties.put(268435456).put(group) // CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE .put(CL_CONTEXT_PLATFORM).put(platform.ID); }else if(glContext instanceof EGLContext) { // TODO test EGL @@ -300,7 +300,7 @@ public final class CLGLContext extends CLContext { } public final <B extends Buffer> CLGLTexture3d<B> createFromGLTexture3d(B directBuffer, int target, int texture, int mipmap, int flags) { - CLGLTexture3d<B> buffer = CLGLTexture3d.createFromGLTexture3d(this, directBuffer, target, texture, mipmap, flags); + CLGLTexture3d<B> buffer = CLGLTexture3d.createFromGLTexture3d(this, directBuffer, flags, target, mipmap, texture); memoryObjects.add(buffer); return buffer; } |