summaryrefslogtreecommitdiffstats
path: root/src/com/jogamp/opencl/gl
diff options
context:
space:
mode:
authorMichael Bien <[email protected]>2011-05-28 13:51:04 +0200
committerMichael Bien <[email protected]>2011-05-28 13:51:04 +0200
commitc06bdd44da347a55d69cc764ecbe698e80db99be (patch)
tree06d3fca6f4969718a77b5aa406984c1d9d2151f1 /src/com/jogamp/opencl/gl
parent098144aa185f396933c52af6c59201add4978b21 (diff)
CLContext uses now CLContextBinding interface.
Diffstat (limited to 'src/com/jogamp/opencl/gl')
-rw-r--r--src/com/jogamp/opencl/gl/CLGLContext.java4
-rw-r--r--src/com/jogamp/opencl/gl/CLGLTexture2d.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/jogamp/opencl/gl/CLGLContext.java b/src/com/jogamp/opencl/gl/CLGLContext.java
index e688717f..f7214b6e 100644
--- a/src/com/jogamp/opencl/gl/CLGLContext.java
+++ b/src/com/jogamp/opencl/gl/CLGLContext.java
@@ -99,7 +99,7 @@ public final class CLGLContext extends CLContext {
long[] glID = new long[1];
NativeSizeBuffer properties = setupContextProperties(platform, glContext, glID);
ErrorDispatcher dispatcher = createErrorHandler();
- long clID = createContextFromType(dispatcher, properties, toDeviceBitmap(deviceTypes));
+ long clID = createContextFromType(platform, dispatcher, properties, toDeviceBitmap(deviceTypes));
return new CLGLContext(platform, glContext, clID, glID[0], dispatcher);
@@ -123,7 +123,7 @@ public final class CLGLContext extends CLContext {
long[] glID = new long[1];
NativeSizeBuffer properties = setupContextProperties(platform, glContext, glID);
ErrorDispatcher dispatcher = createErrorHandler();
- long clID = createContext(dispatcher, properties, devices);
+ long clID = createContext(platform, dispatcher, properties, devices);
CLGLContext context = new CLGLContext(platform, glContext, clID, glID[0], dispatcher);
if(devices != null) {
diff --git a/src/com/jogamp/opencl/gl/CLGLTexture2d.java b/src/com/jogamp/opencl/gl/CLGLTexture2d.java
index 484d00d2..7cbd95d5 100644
--- a/src/com/jogamp/opencl/gl/CLGLTexture2d.java
+++ b/src/com/jogamp/opencl/gl/CLGLTexture2d.java
@@ -70,8 +70,8 @@ public class CLGLTexture2d<B extends Buffer> extends CLGLImage2d<B> implements C
CLImageFormat format = createUninitializedImageFormat();
accessor.getInfo(CL_IMAGE_FORMAT, CLImageFormatImpl.size(), format.getFormatImpl().getBuffer(), null);
- int width = 640; //(int)accessor.getLong(CL_IMAGE_WIDTH);
- int height = 480; //(int)accessor.getLong(CL_IMAGE_HEIGHT);
+ int width = (int)accessor.getLong(CL_IMAGE_WIDTH);
+ int height = (int)accessor.getLong(CL_IMAGE_HEIGHT);
return new CLGLTexture2d<B>(context, directBuffer, format, accessor, target, mipLevel, width, height, id, texture, flags);