uberwolf
diff --git a/‎Core/src/main/Header.vm‎
Lines changed: 8 additions & 5 deletions b/‎Core/src/main/Header.vm‎
Lines changed: 8 additions & 5 deletions
diff --git a/‎Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java‎
Lines changed: 4 additions & 9 deletions b/‎Core/src/main/velocity/com/nativelibs4java/opencl/CLContext.java‎
Lines changed: 4 additions & 9 deletions
@@ -82,8 +82,11 @@
 #macro (eventOutWrapper $queue) CLEvent.createEventFromPointer($queue, eventOut) #end
 #macro (returnEventOut $queue) return #eventOutWrapper($queue); #end
 
-/*
-		#declareReusablePtrsAndEventsInOut()
-		error(CL.clEnqueueTask(queue.getEntityPeer(), getEntityPeer(), #eventsInOutArgs()));
-		#returnEventOut()
-*/
+#macro (declareInfosGetter $name $function)
+	protected static CLInfoGetter $name = new CLInfoGetter() {
+		@Override
+		protected int getInfo(long entity, int infoTypeEnum, long size, Pointer out, Pointer<SizeT> sizeOut) {
+			return $function(entity, infoTypeEnum, size, getPeer(out), getPeer(sizeOut));
+		}
+	};
+#end
@@ -128,13 +128,8 @@ else if ("false".equals(prop) || "0".equals(env))
 		return cacheBinaries;
 	}
 
-	private static CLInfoGetter<cl_context> infos = new CLInfoGetter<cl_context>() {
-
-		@Override
-		protected int getInfo(cl_context entity, int infoTypeEnum, long size, Pointer out, Pointer<SizeT> sizeOut) {
-			return CL.clGetContextInfo(entity, infoTypeEnum, size, out, sizeOut);
-		}
-	};
+	#declareInfosGetter("infos", "CL.clGetContextInfo")
+	
 	CLPlatform platform;
 	protected Pointer<cl_device_id> deviceIds;
 
@@ -258,7 +253,7 @@ public CLSampler createSampler(boolean normalized_coords, AddressingMode address
 	}
 
 	public int getDeviceCount() {
-		return infos.getOptionalFeatureInt(getEntity(), CL.CL_CONTEXT_NUM_DEVICES);
+		return infos.getOptionalFeatureInt(getEntityPeer(), CL.CL_CONTEXT_NUM_DEVICES);
 	}
 
 	/**
@@ -267,7 +262,7 @@ public int getDeviceCount() {
 	 */
 	public synchronized CLDevice[] getDevices() {
 		if (deviceIds == null) {
-			deviceIds = infos.getMemory(getEntity(), CL_CONTEXT_DEVICES).as(cl_device_id.class);
+			deviceIds = infos.getMemory(getEntityPeer(), CL_CONTEXT_DEVICES).as(cl_device_id.class);
 		}
         int n = (int)deviceIds.getValidElements();