opencl_ruby_ffi 0.5 → 0.6

data/lib/opencl_ruby_ffi/Arithmetic_gen.rb

@@ -16,6 +16,9 @@ module OpenCL
     def s0=(value)
      self[:s0] = value
     end
+    def to_s
+      return "Char{ #{self[:s0]} }"
+    end
   end
   # Maps the cl_uchar type of OpenCL
   class UChar < FFI::Struct
@@ -34,6 +37,9 @@ module OpenCL
     def s0=(value)
      self[:s0] = value
     end
+    def to_s
+      return "UChar{ #{self[:s0]} }"
+    end
   end
   # Maps the cl_short type of OpenCL
   class Short < FFI::Struct
@@ -52,6 +58,9 @@ module OpenCL
     def s0=(value)
      self[:s0] = value
     end
+    def to_s
+      return "Short{ #{self[:s0]} }"
+    end
   end
   # Maps the cl_ushort type of OpenCL
   class UShort < FFI::Struct
@@ -70,6 +79,9 @@ module OpenCL
     def s0=(value)
      self[:s0] = value
     end
+    def to_s
+      return "UShort{ #{self[:s0]} }"
+    end
   end
   # Maps the cl_int type of OpenCL
   class Int < FFI::Struct
@@ -88,6 +100,9 @@ module OpenCL
     def s0=(value)
      self[:s0] = value
     end
+    def to_s
+      return "Int{ #{self[:s0]} }"
+    end
   end
   # Maps the cl_uint type of OpenCL
   class UInt < FFI::Struct
@@ -106,6 +121,9 @@ module OpenCL
     def s0=(value)
      self[:s0] = value
     end
+    def to_s
+      return "UInt{ #{self[:s0]} }"
+    end
   end
   # Maps the cl_long type of OpenCL
   class Long < FFI::Struct
@@ -124,6 +142,9 @@ module OpenCL
     def s0=(value)
      self[:s0] = value
     end
+    def to_s
+      return "Long{ #{self[:s0]} }"
+    end
   end
   # Maps the cl_ulong type of OpenCL
   class ULong < FFI::Struct
@@ -142,6 +163,9 @@ module OpenCL
     def s0=(value)
      self[:s0] = value
     end
+    def to_s
+      return "ULong{ #{self[:s0]} }"
+    end
   end
   # Maps the cl_float type of OpenCL
   class Float < FFI::Struct
@@ -160,6 +184,9 @@ module OpenCL
     def s0=(value)
      self[:s0] = value
     end
+    def to_s
+      return "Float{ #{self[:s0]} }"
+    end
   end
   # Maps the cl_double type of OpenCL
   class Double < FFI::Struct
@@ -178,6 +205,9 @@ module OpenCL
     def s0=(value)
      self[:s0] = value
     end
+    def to_s
+      return "Double{ #{self[:s0]} }"
+    end
   end
   # Maps the cl_half type of OpenCL
   class Half < FFI::Struct
@@ -196,6 +226,9 @@ module OpenCL
     def s0=(value)
      self[:s0] = value
     end
+    def to_s
+      return "Half{ #{self[:s0]} }"
+    end
   end
   # Maps the cl_char2 type of OpenCL
   class Char2 < FFI::Struct
@@ -223,6 +256,9 @@ module OpenCL
     def s1=(value)
      self[:s1] = value
     end
+    def to_s
+      return "Char2{ #{self[:s0]}, #{self[:s1]} }"
+    end
   end
   # Maps the cl_uchar2 type of OpenCL
   class UChar2 < FFI::Struct
@@ -250,6 +286,9 @@ module OpenCL
     def s1=(value)
      self[:s1] = value
     end
+    def to_s
+      return "UChar2{ #{self[:s0]}, #{self[:s1]} }"
+    end
   end
   # Maps the cl_short2 type of OpenCL
   class Short2 < FFI::Struct
@@ -277,6 +316,9 @@ module OpenCL
     def s1=(value)
      self[:s1] = value
     end
+    def to_s
+      return "Short2{ #{self[:s0]}, #{self[:s1]} }"
+    end
   end
   # Maps the cl_ushort2 type of OpenCL
   class UShort2 < FFI::Struct
@@ -304,6 +346,9 @@ module OpenCL
     def s1=(value)
      self[:s1] = value
     end
+    def to_s
+      return "UShort2{ #{self[:s0]}, #{self[:s1]} }"
+    end
   end
   # Maps the cl_int2 type of OpenCL
   class Int2 < FFI::Struct
@@ -331,6 +376,9 @@ module OpenCL
     def s1=(value)
      self[:s1] = value
     end
+    def to_s
+      return "Int2{ #{self[:s0]}, #{self[:s1]} }"
+    end
   end
   # Maps the cl_uint2 type of OpenCL
   class UInt2 < FFI::Struct
@@ -358,6 +406,9 @@ module OpenCL
     def s1=(value)
      self[:s1] = value
     end
+    def to_s
+      return "UInt2{ #{self[:s0]}, #{self[:s1]} }"
+    end
   end
   # Maps the cl_long2 type of OpenCL
   class Long2 < FFI::Struct
@@ -385,6 +436,9 @@ module OpenCL
     def s1=(value)
      self[:s1] = value
     end
+    def to_s
+      return "Long2{ #{self[:s0]}, #{self[:s1]} }"
+    end
   end
   # Maps the cl_ulong2 type of OpenCL
   class ULong2 < FFI::Struct
@@ -412,6 +466,9 @@ module OpenCL
     def s1=(value)
      self[:s1] = value
     end
+    def to_s
+      return "ULong2{ #{self[:s0]}, #{self[:s1]} }"
+    end
   end
   # Maps the cl_float2 type of OpenCL
   class Float2 < FFI::Struct
@@ -439,6 +496,9 @@ module OpenCL
     def s1=(value)
      self[:s1] = value
     end
+    def to_s
+      return "Float2{ #{self[:s0]}, #{self[:s1]} }"
+    end
   end
   # Maps the cl_double2 type of OpenCL
   class Double2 < FFI::Struct
@@ -466,6 +526,9 @@ module OpenCL
     def s1=(value)
      self[:s1] = value
     end
+    def to_s
+      return "Double2{ #{self[:s0]}, #{self[:s1]} }"
+    end
   end
   # Maps the cl_half2 type of OpenCL
   class Half2 < FFI::Struct
@@ -493,6 +556,9 @@ module OpenCL
     def s1=(value)
      self[:s1] = value
     end
+    def to_s
+      return "Half2{ #{self[:s0]}, #{self[:s1]} }"
+    end
   end
   # Maps the cl_char4 type of OpenCL
   class Char4 < FFI::Struct
@@ -538,6 +604,9 @@ module OpenCL
     def s3=(value)
      self[:s3] = value
     end
+    def to_s
+      return "Char4{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]} }"
+    end
   end
   # Maps the cl_uchar4 type of OpenCL
   class UChar4 < FFI::Struct
@@ -583,6 +652,9 @@ module OpenCL
     def s3=(value)
      self[:s3] = value
     end
+    def to_s
+      return "UChar4{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]} }"
+    end
   end
   # Maps the cl_short4 type of OpenCL
   class Short4 < FFI::Struct
@@ -628,6 +700,9 @@ module OpenCL
     def s3=(value)
      self[:s3] = value
     end
+    def to_s
+      return "Short4{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]} }"
+    end
   end
   # Maps the cl_ushort4 type of OpenCL
   class UShort4 < FFI::Struct
@@ -673,6 +748,9 @@ module OpenCL
     def s3=(value)
      self[:s3] = value
     end
+    def to_s
+      return "UShort4{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]} }"
+    end
   end
   # Maps the cl_int4 type of OpenCL
   class Int4 < FFI::Struct
@@ -718,6 +796,9 @@ module OpenCL
     def s3=(value)
      self[:s3] = value
     end
+    def to_s
+      return "Int4{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]} }"
+    end
   end
   # Maps the cl_uint4 type of OpenCL
   class UInt4 < FFI::Struct
@@ -763,6 +844,9 @@ module OpenCL
     def s3=(value)
      self[:s3] = value
     end
+    def to_s
+      return "UInt4{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]} }"
+    end
   end
   # Maps the cl_long4 type of OpenCL
   class Long4 < FFI::Struct
@@ -808,6 +892,9 @@ module OpenCL
     def s3=(value)
      self[:s3] = value
     end
+    def to_s
+      return "Long4{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]} }"
+    end
   end
   # Maps the cl_ulong4 type of OpenCL
   class ULong4 < FFI::Struct
@@ -853,6 +940,9 @@ module OpenCL
     def s3=(value)
      self[:s3] = value
     end
+    def to_s
+      return "ULong4{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]} }"
+    end
   end
   # Maps the cl_float4 type of OpenCL
   class Float4 < FFI::Struct
@@ -898,6 +988,9 @@ module OpenCL
     def s3=(value)
      self[:s3] = value
     end
+    def to_s
+      return "Float4{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]} }"
+    end
   end
   # Maps the cl_double4 type of OpenCL
   class Double4 < FFI::Struct
@@ -943,6 +1036,9 @@ module OpenCL
     def s3=(value)
      self[:s3] = value
     end
+    def to_s
+      return "Double4{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]} }"
+    end
   end
   # Maps the cl_half4 type of OpenCL
   class Half4 < FFI::Struct
@@ -988,6 +1084,9 @@ module OpenCL
     def s3=(value)
      self[:s3] = value
     end
+    def to_s
+      return "Half4{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]} }"
+    end
   end
   # Maps the cl_char8 type of OpenCL
   class Char8 < FFI::Struct
@@ -1069,6 +1168,9 @@ module OpenCL
     def s7=(value)
      self[:s7] = value
     end
+    def to_s
+      return "Char8{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]} }"
+    end
   end
   # Maps the cl_uchar8 type of OpenCL
   class UChar8 < FFI::Struct
@@ -1150,6 +1252,9 @@ module OpenCL
     def s7=(value)
      self[:s7] = value
     end
+    def to_s
+      return "UChar8{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]} }"
+    end
   end
   # Maps the cl_short8 type of OpenCL
   class Short8 < FFI::Struct
@@ -1231,6 +1336,9 @@ module OpenCL
     def s7=(value)
      self[:s7] = value
     end
+    def to_s
+      return "Short8{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]} }"
+    end
   end
   # Maps the cl_ushort8 type of OpenCL
   class UShort8 < FFI::Struct
@@ -1312,6 +1420,9 @@ module OpenCL
     def s7=(value)
      self[:s7] = value
     end
+    def to_s
+      return "UShort8{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]} }"
+    end
   end
   # Maps the cl_int8 type of OpenCL
   class Int8 < FFI::Struct
@@ -1393,6 +1504,9 @@ module OpenCL
     def s7=(value)
      self[:s7] = value
     end
+    def to_s
+      return "Int8{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]} }"
+    end
   end
   # Maps the cl_uint8 type of OpenCL
   class UInt8 < FFI::Struct
@@ -1474,6 +1588,9 @@ module OpenCL
     def s7=(value)
      self[:s7] = value
     end
+    def to_s
+      return "UInt8{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]} }"
+    end
   end
   # Maps the cl_long8 type of OpenCL
   class Long8 < FFI::Struct
@@ -1555,6 +1672,9 @@ module OpenCL
     def s7=(value)
      self[:s7] = value
     end
+    def to_s
+      return "Long8{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]} }"
+    end
   end
   # Maps the cl_ulong8 type of OpenCL
   class ULong8 < FFI::Struct
@@ -1636,6 +1756,9 @@ module OpenCL
     def s7=(value)
      self[:s7] = value
     end
+    def to_s
+      return "ULong8{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]} }"
+    end
   end
   # Maps the cl_float8 type of OpenCL
   class Float8 < FFI::Struct
@@ -1717,6 +1840,9 @@ module OpenCL
     def s7=(value)
      self[:s7] = value
     end
+    def to_s
+      return "Float8{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]} }"
+    end
   end
   # Maps the cl_double8 type of OpenCL
   class Double8 < FFI::Struct
@@ -1798,6 +1924,9 @@ module OpenCL
     def s7=(value)
      self[:s7] = value
     end
+    def to_s
+      return "Double8{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]} }"
+    end
   end
   # Maps the cl_half8 type of OpenCL
   class Half8 < FFI::Struct
@@ -1879,6 +2008,9 @@ module OpenCL
     def s7=(value)
      self[:s7] = value
     end
+    def to_s
+      return "Half8{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]} }"
+    end
   end
   # Maps the cl_char16 type of OpenCL
   class Char16 < FFI::Struct
@@ -2032,6 +2164,9 @@ module OpenCL
     def sf=(value)
      self[:sf] = value
     end
+    def to_s
+      return "Char16{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]}, #{self[:s8]}, #{self[:s9]}, #{self[:sa]}, #{self[:sb]}, #{self[:sc]}, #{self[:sd]}, #{self[:se]}, #{self[:sf]} }"
+    end
   end
   # Maps the cl_uchar16 type of OpenCL
   class UChar16 < FFI::Struct
@@ -2185,6 +2320,9 @@ module OpenCL
     def sf=(value)
      self[:sf] = value
     end
+    def to_s
+      return "UChar16{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]}, #{self[:s8]}, #{self[:s9]}, #{self[:sa]}, #{self[:sb]}, #{self[:sc]}, #{self[:sd]}, #{self[:se]}, #{self[:sf]} }"
+    end
   end
   # Maps the cl_short16 type of OpenCL
   class Short16 < FFI::Struct
@@ -2338,6 +2476,9 @@ module OpenCL
     def sf=(value)
      self[:sf] = value
     end
+    def to_s
+      return "Short16{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]}, #{self[:s8]}, #{self[:s9]}, #{self[:sa]}, #{self[:sb]}, #{self[:sc]}, #{self[:sd]}, #{self[:se]}, #{self[:sf]} }"
+    end
   end
   # Maps the cl_ushort16 type of OpenCL
   class UShort16 < FFI::Struct
@@ -2491,6 +2632,9 @@ module OpenCL
     def sf=(value)
      self[:sf] = value
     end
+    def to_s
+      return "UShort16{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]}, #{self[:s8]}, #{self[:s9]}, #{self[:sa]}, #{self[:sb]}, #{self[:sc]}, #{self[:sd]}, #{self[:se]}, #{self[:sf]} }"
+    end
   end
   # Maps the cl_int16 type of OpenCL
   class Int16 < FFI::Struct
@@ -2644,6 +2788,9 @@ module OpenCL
     def sf=(value)
      self[:sf] = value
     end
+    def to_s
+      return "Int16{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]}, #{self[:s8]}, #{self[:s9]}, #{self[:sa]}, #{self[:sb]}, #{self[:sc]}, #{self[:sd]}, #{self[:se]}, #{self[:sf]} }"
+    end
   end
   # Maps the cl_uint16 type of OpenCL
   class UInt16 < FFI::Struct
@@ -2797,6 +2944,9 @@ module OpenCL
     def sf=(value)
      self[:sf] = value
     end
+    def to_s
+      return "UInt16{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]}, #{self[:s8]}, #{self[:s9]}, #{self[:sa]}, #{self[:sb]}, #{self[:sc]}, #{self[:sd]}, #{self[:se]}, #{self[:sf]} }"
+    end
   end
   # Maps the cl_long16 type of OpenCL
   class Long16 < FFI::Struct
@@ -2950,6 +3100,9 @@ module OpenCL
     def sf=(value)
      self[:sf] = value
     end
+    def to_s
+      return "Long16{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]}, #{self[:s8]}, #{self[:s9]}, #{self[:sa]}, #{self[:sb]}, #{self[:sc]}, #{self[:sd]}, #{self[:se]}, #{self[:sf]} }"
+    end
   end
   # Maps the cl_ulong16 type of OpenCL
   class ULong16 < FFI::Struct
@@ -3103,6 +3256,9 @@ module OpenCL
     def sf=(value)
      self[:sf] = value
     end
+    def to_s
+      return "ULong16{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]}, #{self[:s8]}, #{self[:s9]}, #{self[:sa]}, #{self[:sb]}, #{self[:sc]}, #{self[:sd]}, #{self[:se]}, #{self[:sf]} }"
+    end
   end
   # Maps the cl_float16 type of OpenCL
   class Float16 < FFI::Struct
@@ -3256,6 +3412,9 @@ module OpenCL
     def sf=(value)
      self[:sf] = value
     end
+    def to_s
+      return "Float16{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]}, #{self[:s8]}, #{self[:s9]}, #{self[:sa]}, #{self[:sb]}, #{self[:sc]}, #{self[:sd]}, #{self[:se]}, #{self[:sf]} }"
+    end
   end
   # Maps the cl_double16 type of OpenCL
   class Double16 < FFI::Struct
@@ -3409,6 +3568,9 @@ module OpenCL
     def sf=(value)
      self[:sf] = value
     end
+    def to_s
+      return "Double16{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]}, #{self[:s8]}, #{self[:s9]}, #{self[:sa]}, #{self[:sb]}, #{self[:sc]}, #{self[:sd]}, #{self[:se]}, #{self[:sf]} }"
+    end
   end
   # Maps the cl_half16 type of OpenCL
   class Half16 < FFI::Struct
@@ -3562,5 +3724,8 @@ module OpenCL
     def sf=(value)
      self[:sf] = value
     end
+    def to_s
+      return "Half16{ #{self[:s0]}, #{self[:s1]}, #{self[:s2]}, #{self[:s3]}, #{self[:s4]}, #{self[:s5]}, #{self[:s6]}, #{self[:s7]}, #{self[:s8]}, #{self[:s9]}, #{self[:sa]}, #{self[:sb]}, #{self[:sc]}, #{self[:sd]}, #{self[:se]}, #{self[:sf]} }"
+    end
   end
 end

data/lib/opencl_ruby_ffi/Buffer.rb

@@ -18,7 +18,7 @@ module OpenCL
     error = FFI::MemoryPointer.new( :cl_int )
     buff = OpenCL.clCreateBuffer(context, flags, size, host_ptr, error)
     OpenCL.error_check(error.read_cl_int)
-    return Buffer::new( buff, false )
+    return OpenCL::Buffer::new( buff, false )
   end
 
   # Creates a Buffer from a sub part of an existing Buffer
@@ -39,7 +39,7 @@ module OpenCL
     error = FFI::MemoryPointer::new( :cl_int )
     buff = OpenCL.clCreateSubBuffer( buffer, flags, type, info, error)
     OpenCL.error_check(error.read_cl_int)
-    return Buffer::new( buff, false )
+    return OpenCL::Buffer::new( buff, false )
   end
 
   # Creates Buffer from an opengl buffer
@@ -58,7 +58,7 @@ module OpenCL
     error = FFI::MemoryPointer::new( :cl_int )
     buff = OpenCL.clCreateFromGLBuffer( context, flags, bufobj, error )
     OpenCL.error_check(error.read_cl_int)
-    return Buffer::new( buff, false )
+    return OpenCL::Buffer::new( buff, false )
   end
 
   # Maps the cl_mem OpenCL object of type CL_MEM_OBJECT_BUFFER

data/lib/opencl_ruby_ffi/CommandQueue.rb

@@ -38,7 +38,7 @@ module OpenCL
     error = FFI::MemoryPointer::new( :cl_int )
     cmd = OpenCL.clCreateCommandQueue( context, device, properties, error )
     OpenCL.error_check(error.read_cl_int)
-    return CommandQueue::new(cmd, false)
+    return OpenCL::CommandQueue::new(cmd, false)
   end
 
   # Enqueues a command to indicate which device a set of memory objects should be migrated to
@@ -69,7 +69,7 @@ module OpenCL
     end
     flags = OpenCL.get_flags( options )
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueMigrateMemObjects( command_queue, num_mem_objects, mem_list, flags, num_events, events, event )
     OpenCL.error_check( error )
     return OpenCL::Event::new( event.read_ptr, false )
@@ -108,7 +108,7 @@ module OpenCL
     num_events, events = OpenCL.get_event_wait_list( options )
     image_row_pitch = FFI::MemoryPointer::new( :size_t )
     image_slice_pitch = FFI::MemoryPointer::new( :size_t )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = FFI::MemoryPointer::new( :cl_int )
     OpenCL.clEnqueueMapImage( command_queue, image, blocking, map_flags, origin, region, image_row_pitch, image_slice_pitch, num_events, events, event, error )
     OpenCL.error_check( error.read_cl_int )
@@ -146,7 +146,7 @@ module OpenCL
     size = buffer.size - offset
     size = options[:size] - offset if options[:size]
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = FFI::MemoryPointer::new( :cl_int )
     ptr = OpenCL.clEnqueueMapBuffer( command_queue, buffer, blocking, map_flags, offset, size, num_events, events, error )
     OpenCL.error_check( error.read_cl_int )
@@ -172,7 +172,7 @@ module OpenCL
   # the Event associated with the command
   def self.enqueue_unmap_mem_object( command_queue, mem_obj, mapped_ptr, options = {} )
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueUnmapMemObject( command_queue, mem_obj, mapped_ptr, num_events, events, event )
     OpenCL.error_check( error )
     return OpenCL::Event::new( event.read_ptr, false )
@@ -249,7 +249,7 @@ module OpenCL
       host_slice_pitch = 0
     end
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueReadBufferRect(command_queue, buffer, blocking, buffer_origin, host_origin, r, buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, ptr, num_events, events, event)
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -326,7 +326,7 @@ module OpenCL
       host_slice_pitch = 0
     end
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueWriteBufferRect(command_queue, buffer, blocking, buffer_origin, host_origin, r, buffer_row_pitch, buffer_slice_pitch, host_row_pitch, host_slice_pitch, ptr, num_events, events, event)
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -397,7 +397,7 @@ module OpenCL
       dst_slice_pitch = 0
     end
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueCopyBufferRect(command_queue, src_buffer, dst_buffer, src_origin, dst_origin, r, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, num_events, events, event)
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -430,7 +430,7 @@ module OpenCL
     size = [ src_buffer.size - src_offset, dst_buffer.size - dst_offset ].min
     size = options[:size] if options[:size]
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueCopyBuffer(command_queue, src_buffer, dst_buffer, src_offset, dst_offset, size, num_events, events, event)
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -465,7 +465,7 @@ module OpenCL
     size = buffer.size - offset
     size = options[:size] if options[:size]
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueWriteBuffer(command_queue, buffer, blocking, offset, size, ptr, num_events, events, event)
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -499,7 +499,7 @@ module OpenCL
     size = buffer.size - offset
     size = options[:size] if options[:size]
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueReadBuffer(command_queue, buffer, blocking, offset, size, ptr, num_events, events, event)
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -524,13 +524,13 @@ module OpenCL
     num_objs = [mem_objects].flatten.length
     objs = nil
     if num_objs > 0 then
-      objs = FFI::MemoryPointer::new(  Mem, num_objs )
+      objs = FFI::MemoryPointer::new(  OpenCL::Mem, num_objs )
       [mem_objects].flatten.each_with_index { |o, i|
         objs[i].write_pointer(e)
       }
     end
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueAcquireGLObject( command_queue, num_objs, objs, num_events, events, event )
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -555,13 +555,13 @@ module OpenCL
     num_objs = [mem_objects].flatten.length
     objs = nil
     if num_objs > 0 then
-      objs = FFI::MemoryPointer::new(  Mem, num_objs )
+      objs = FFI::MemoryPointer::new(  OpenCL::Mem, num_objs )
       [mem_objects].flatten.each_with_index { |o, i|
         objs[i].write_pointer(e)
       }
     end
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueReleaseGLObject( command_queue, num_objs, objs, num_events, events, event )
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -595,7 +595,7 @@ module OpenCL
     size = (buffer.size - offset) % pattern_size
     size = options[:size] if options[:size]
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueFillBuffer( command_queue, buffer, pattern, pattern_size, offset, size, num_events, events, event )
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -623,7 +623,7 @@ module OpenCL
     OpenCL.error_check(OpenCL::INVALID_OPERATION) if command_queue.context.platform.version_number < 1.1
     origin, region = OpenCL.get_origin_region( image, options, :origin, :region )
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueFillImage( command_queue, image, fill_color, origin, region, num_events, events, event )
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -653,7 +653,7 @@ module OpenCL
     dst_offset = 0
     dst_offset = options[:dst_offset] if options[:dst_offset]
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueCopyImageToBuffer( command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events, events, event )
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -683,7 +683,7 @@ module OpenCL
     src_offset = 0
     src_offset = options[:src_offset] if options[:src_offset]
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueCopyBufferToImage( command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events, events, event )
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -722,7 +722,7 @@ module OpenCL
     input_slice_pitch = 0
     input_slice_pitch = options[:input_slice_pitch] if options[:input_slice_pitch]
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueWriteImage( command_queue, image, blocking, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events, events, event )
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -755,7 +755,7 @@ module OpenCL
       region[i].write_size_t( [src_region[i].read_size_t, dst_region[i].read_size_t].min )
     }
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueCopyImage( command_queue, src_image, dst_image, src_origin, dst_origin, region, num_events, events, event )
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -793,7 +793,7 @@ module OpenCL
     slice_pitch = 0
     slice_pitch = options[:slice_pitch] if options[:slice_pitch]
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueReadImage( command_queue, image, blocking, origin, region, row_pitch, slice_pitch, ptr, num_events, events, event )
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -837,7 +837,7 @@ module OpenCL
       num_mem_objects = options[:mem_list].length
       if num_mem_objects > 0 then
         mem_list = FFI::MemoryPointer::new( OpenCL::Mem, num_mem_objects )
-        mem_loc = FFI::MemoryPointer::new( Pointer, num_mem_objects )
+        mem_loc = FFI::MemoryPointer::new( :pointer, num_mem_objects )
         i = 0
         options[:mem_list].each { |key, value|
           mem_list[i].write_pointer(key)
@@ -847,7 +847,7 @@ module OpenCL
       end
     end
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueNativeKernel( command_queue, func, args, args_size, num_mem_objects, mem_list, mem_loc, num_events, events, event )
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -870,7 +870,7 @@ module OpenCL
   # the Event associated with the command
   def self.enqueue_task( command_queue, kernel, options = {} )
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueTask( command_queue, kernel, num_events, events, event )
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -914,7 +914,7 @@ module OpenCL
       }
     end
     num_events, events = OpenCL.get_event_wait_list( options )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     error = OpenCL.clEnqueueNDRangeKernel(command_queue, kernel, global_work_size.length, gwo, gws, lws, num_events, events, event)
     OpenCL.error_check(error)
     return OpenCL::Event::new(event.read_pointer, false)
@@ -948,7 +948,7 @@ module OpenCL
     if command_queue.context.platform.version_number < 1.2 then
       num_events = [events].flatten.length
       if num_events > 0 then
-        evts = FFI::MemoryPointer::new( Event, num_events )
+        evts = FFI::MemoryPointer::new( OpenCL::Event, num_events )
         [events].flatten.each_with_index { |e, i|
           evts[i].write_pointer(e)
         }
@@ -962,12 +962,12 @@ module OpenCL
       num_events = [events].flatten.length
       evts = nil
       if num_events > 0 then
-        evts = FFI::MemoryPointer::new( Event, num_events )
+        evts = FFI::MemoryPointer::new( OpenCL::Event, num_events )
         [events].flatten.each_with_index { |e, i|
           evts[i].write_pointer(e)
         }
       end
-      event = FFI::MemoryPointer::new( Event )
+      event = FFI::MemoryPointer::new( OpenCL::Event )
       error = OpenCL.clEnqueueBarrierWithWaitList( command_queue, num_events, evts, event )
       OpenCL.error_check(error)
       return OpenCL::Event::new(event.read_pointer, false)
@@ -985,14 +985,14 @@ module OpenCL
   #
   # an Event
   def self.enqueue_marker( command_queue, events = [] )
-    event = FFI::MemoryPointer::new( Event )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
     if command_queue.context.platform.version_number < 1.2 then
       error = OpenCL.clEnqueueMarker( command_queue, event )
     else
       num_events = [events].flatten.length
       evts = nil
       if num_events > 0 then
-        evts = FFI::MemoryPointer::new( Event, num_events )
+        evts = FFI::MemoryPointer::new( OpenCL::Event, num_events )
         [events].flatten.each_with_index { |e, i|
           evts[i].write_pointer(e)
         }
@@ -1008,16 +1008,16 @@ module OpenCL
 
     # Returns the Context associated to the CommandQueue
     def context
-      ptr = FFI::MemoryPointer::new( Context )
-      error = OpenCL.clGetCommandQueueInfo(self, CommandQueue::CONTEXT, Context.size, ptr, nil)
+      ptr = FFI::MemoryPointer::new( OpenCL::Context )
+      error = OpenCL.clGetCommandQueueInfo(self, OpenCL::CommandQueue::CONTEXT, Context.size, ptr, nil)
       OpenCL.error_check(error)
       return OpenCL::Context::new( ptr.read_pointer )
     end
 
     # Returns the Device associated to the CommandQueue
     def device
-      ptr = FFI::MemoryPointer::new( Device )
-      error = OpenCL.clGetCommandQueueInfo(self, CommandQueue::DEVICE, Device.size, ptr, nil)
+      ptr = FFI::MemoryPointer::new( OpenCL::Device )
+      error = OpenCL.clGetCommandQueueInfo(self, OpenCL::CommandQueue::DEVICE, Device.size, ptr, nil)
       OpenCL.error_check(error)
       return OpenCL::Device::new( ptr.read_pointer )
     end

data/lib/opencl_ruby_ffi/Context.rb

@@ -72,12 +72,12 @@ module OpenCL
     def num_devices
       d_n = 0
       ptr = FFI::MemoryPointer::new( :size_t )
-      error = OpenCL.clGetContextInfo(self, Context::DEVICES, 0, nil, ptr)
+      error = OpenCL.clGetContextInfo(self, OpenCL::Context::DEVICES, 0, nil, ptr)
       OpenCL.error_check(error)
       d_n = ptr.read_size_t / Platform.size
 #      else
 #        ptr = FFI::MemoryPointer::new( :cl_uint )
-#        error = OpenCL.clGetContextInfo(self, Context::NUM_DEVICES, ptr.size, ptr, nil)
+#        error = OpenCL.clGetContextInfo(self, OpenCL::Context::NUM_DEVICES, ptr.size, ptr, nil)
 #        OpenCL.error_check(error)
 #        d_n = ptr.read_cl_uint
 #      end
@@ -88,7 +88,7 @@ module OpenCL
     def devices
       n = self.num_devices
       ptr2 = FFI::MemoryPointer::new( Device, n )
-      error = OpenCL.clGetContextInfo(self, Context::DEVICES, Device.size*n, ptr2, nil)
+      error = OpenCL.clGetContextInfo(self, OpenCL::Context::DEVICES, Device.size*n, ptr2, nil)
       OpenCL.error_check(error)
       return ptr2.get_array_of_pointer(0, n).collect { |device_ptr|
         OpenCL::Device::new(device_ptr)

data/lib/opencl_ruby_ffi/Device.rb

@@ -141,7 +141,7 @@ module OpenCL
     # Returns the platform the Device belongs to
     def platform
       ptr = FFI::MemoryPointer::new( OpenCL::Platform )
-      error = OpenCL.clGetDeviceInfo(self, Device::PLATFORM, OpenCL::Platform.size, ptr, nil)
+      error = OpenCL.clGetDeviceInfo(self, OpenCL::Device::PLATFORM, OpenCL::Platform.size, ptr, nil)
       OpenCL.error_check(error)
       return OpenCL::Platform::new(ptr.read_pointer)
     end
@@ -149,7 +149,7 @@ module OpenCL
     # Returns the parent Device if it exists
     def parent_device
       ptr = FFI::MemoryPointer::new( OpenCL::Device )
-      error = OpenCL.clGetDeviceInfo(self, Device::PARENT_DEVICE, OpenCL::Device.size, ptr, nil)
+      error = OpenCL.clGetDeviceInfo(self, OpenCL::Device::PARENT_DEVICE, OpenCL::Device.size, ptr, nil)
       OpenCL.error_check(error)
       return nil if ptr.null?
       return OpenCL::Device::new(ptr.read_pointer)

data/lib/opencl_ruby_ffi/Event.rb

@@ -40,7 +40,7 @@ module OpenCL
     error = FFI::MemoryPointer::new(:cl_int)
     event = OpenCL.clCreateUserEvent(context, error)
     OpenCL.error_check(error.read_cl_int)
-    return Event::new(event, false)
+    return OpenCL::Event::new(event, false)
   end
 
   # Sets the satus of user Event to the given execution status
@@ -61,7 +61,7 @@ module OpenCL
     error = FFI::MemoryPointer::new(:cl_int)
     event = OpenCL.clCreateEventFromGLsyncKHR(context, sync, error)
     OpenCL.error_check(error.read_cl_int)
-    return Event::new(event, false)
+    return OpenCL::Event::new(event, false)
   end
 
   # Maps the cl_event object
@@ -69,8 +69,8 @@ module OpenCL
 
     # Returns the CommandQueue associated with the Event, if it exists
     def command_queue
-      ptr = FFI::MemoryPointer::new( CommandQueue )
-      error = OpenCL.clGetEventInfo(self, Event::COMMAND_QUEUE, CommandQueue.size, ptr, nil)
+      ptr = FFI::MemoryPointer::new( OpenCL::CommandQueue )
+      error = OpenCL.clGetEventInfo(self, OpenCL::Event::COMMAND_QUEUE, OpenCL::CommandQueue.size, ptr, nil)
       OpenCL.error_check(error)
       pt = ptr.read_pointer
       if pt.null? then
@@ -82,8 +82,8 @@ module OpenCL
 
     # Returns the Context associated with the Event
     def context
-      ptr = FFI::MemoryPointer::new( Context )
-      error = OpenCL.clGetEventInfo(self, Event::CONTEXT, Context.size, ptr, nil)
+      ptr = FFI::MemoryPointer::new( OpenCL::Context )
+      error = OpenCL.clGetEventInfo(self, OpenCL::Event::CONTEXT, OpenCL::Context.size, ptr, nil)
       OpenCL.error_check(error)
       return OpenCL::Context::new( ptr.read_pointer )
     end

data/lib/opencl_ruby_ffi/Image.rb

@@ -18,7 +18,7 @@ module OpenCL
     error = FFI::MemoryPointer::new( :cl_int )
     img_ptr = OpenCL.clCreateImage( context, flags, format, desc, host_ptr, error )
     OpenCL.error_check(error.read_cl_int)
-    return Image::new(img_ptr, false)
+    return OpenCL::Image::new(img_ptr, false)
   end
 
   # Creates a 1D Image
@@ -67,7 +67,7 @@ module OpenCL
     error = FFI::MemoryPointer::new( :cl_int )
     img_ptr = OpenCL.clCreateImage2D( context, flags, format, width, heigh, row_pitch, host_ptr, error )
     OpenCL.error_check(error.read_cl_int)
-    return Image::new(img_ptr, false)
+    return OpenCL::Image::new(img_ptr, false)
   end
 
   # Creates a 3D Image
@@ -98,7 +98,7 @@ module OpenCL
     error = FFI::MemoryPointer::new( :cl_int )
     img_ptr = OpenCL.clCreateImage3D( context, fs, format, width, heigh, depth, row_pitch, slice_pitch, d, error )
     OpenCL.error_check(error.read_cl_int)
-    return Image::new(img_ptr, false)
+    return OpenCL::Image::new(img_ptr, false)
   end
 
   # Creates an Image from an OpenGL render buffer
@@ -117,7 +117,7 @@ module OpenCL
     error = FFI::MemoryPointer::new( :cl_int )
     img = OpenCL.clCreateFromGLRenderBuffer( context, flags, renderbuffer, error )
     OpenCL.error_check(error.read_cl_int)
-    return Image::new( img, false )
+    return OpenCL::Image::new( img, false )
   end
 
   # Creates an Image from an OpenGL texture
@@ -143,7 +143,7 @@ module OpenCL
     error = FFI::MemoryPointer::new( :cl_int )
     img = OpenCL.clCreateFromGLTexture( context, flags, texture_target, miplevel, texture, error )
     OpenCL.error_check(error.read_cl_int)
-    return Image::new( img, false )
+    return OpenCL::Image::new( img, false )
   end
 
   # Creates an Image from an OpenGL 2D texture
@@ -168,7 +168,7 @@ module OpenCL
     error = FFI::MemoryPointer::new( :cl_int )
     img = OpenCL.clCreateFromGLTexture2D( context, flags, texture_target, miplevel, texture, error )
     OpenCL.error_check(error.read_cl_int)
-    return Image::new( img, false )
+    return OpenCL::Image::new( img, false )
   end
 
   # Creates an Image from an OpenGL 3D texture
@@ -193,7 +193,7 @@ module OpenCL
     error = FFI::MemoryPointer::new( :cl_int )
     img = OpenCL.clCreateFromGLTexture3D( context, flags, texture_target, miplevel, texture, error )
     OpenCL.error_check(error.read_cl_int)
-    return Image::new( img, false )
+    return OpenCL::Image::new( img, false )
   end
 
   # Maps the cl_mem OpenCL objects of type CL_MEM_OBJECT_IMAGE*
@@ -244,12 +244,12 @@ module OpenCL
 
     # Returns the ImageDesc corresponding to the Image
     def desc
-      return ImageDesc::new( self.type, self.width, self.height, self.depth, self.array_size, self.row_pitch, self.slice_pitch, self.num_mip_levels, self.num_samples, self.buffer )
+      return OpenCL::ImageDesc::new( self.type, self.width, self.height, self.depth, self.array_size, self.row_pitch, self.slice_pitch, self.num_mip_levels, self.num_samples, self.buffer )
     end
 
     # Returns the ImageFormat corresponding to the image
     def format
-      image_format = FFI::MemoryPointer::new( ImageFormat )
+      image_format = FFI::MemoryPointer::new( OpenCL::ImageFormat )
       error = OpenCL.clGetImageInfo( self, OpenCL::Image::FORMAT, image_format.size, image_format, nil)
       OpenCL.error_check(error)
       return OpenCL::ImageFormat::from_pointer( image_format )

data/lib/opencl_ruby_ffi/Kernel.rb

@@ -144,7 +144,7 @@ module OpenCL
     # Returns the Context the Kernel is associated with
     def context
       ptr = FFI::MemoryPointer::new( Context )
-      error = OpenCL.clGetKernelInfo(self, Kernel::CONTEXT, Context.size, ptr, nil)
+      error = OpenCL.clGetKernelInfo(self, OpenCL::Kernel::CONTEXT, Context.size, ptr, nil)
       OpenCL.error_check(error)
       return OpenCL::Context::new( ptr.read_pointer )
     end
@@ -152,7 +152,7 @@ module OpenCL
     # Returns the Program the Kernel was created from
     def program
       ptr = FFI::MemoryPointer::new( Program )
-      error = OpenCL.clGetKernelInfo(self, Kernel::PROGRAM, Program.size, ptr, nil)
+      error = OpenCL.clGetKernelInfo(self, OpenCL::Kernel::PROGRAM, Program.size, ptr, nil)
       OpenCL.error_check(error)
       return OpenCL::Program::new(ptr.read_pointer)
     end

data/lib/opencl_ruby_ffi/Mem.rb

@@ -24,7 +24,7 @@ module OpenCL
     # Returns the Context associated to the Mem
     def context
       ptr = FFI::MemoryPointer::new( Context )
-      error = OpenCL.clGetMemObjectInfo(self, Mem::CONTEXT, Context.size, ptr, nil)
+      error = OpenCL.clGetMemObjectInfo(self, OpenCL::Mem::CONTEXT, Context.size, ptr, nil)
       OpenCL.error_check(error)
       return OpenCL::Context::new( ptr.read_pointer )
     end
@@ -37,7 +37,7 @@ module OpenCL
     # Returns the Buffer this Buffer was created from using create_sub_buffer
     def associated_memobject
       ptr = FFI::MemoryPointer::new( Mem )
-      error = OpenCL.clGetMemObjectInfo(self, Mem::ASSOCIATED_MEMOBJECT, Mem.size, ptr, nil)
+      error = OpenCL.clGetMemObjectInfo(self, OpenCL::Mem::ASSOCIATED_MEMOBJECT, Mem.size, ptr, nil)
       OpenCL.error_check(error)
       return nil if ptr.read_pointer.null?
       return OpenCL::Mem::new( ptr.read_pointer )

data/lib/opencl_ruby_ffi/Program.rb

@@ -324,7 +324,7 @@ module OpenCL
         total_size += s
         bin_array[i].write_pointer(FFI::MemoryPointer::new(s))
       }
-      error = OpenCL.clGetProgramInfo(self, Program::BINARIES, total_size, bin_array, nil)
+      error = OpenCL.clGetProgramInfo(self, OpenCL::Program::BINARIES, total_size, bin_array, nil)
       OpenCL.error_check(error)
       bins = []
       devs = self.devices
@@ -369,7 +369,7 @@ module OpenCL
     # Returns the Context the Program is associated to
     def context
       ptr = FFI::MemoryPointer::new( Context )
-      error = OpenCL.clGetProgramInfo(self, Program::CONTEXT, Context.size, ptr, nil)
+      error = OpenCL.clGetProgramInfo(self, OpenCL::Program::CONTEXT, Context.size, ptr, nil)
       OpenCL.error_check(error)
       return OpenCL::Context::new( ptr.read_pointer )
     end
@@ -389,7 +389,7 @@ module OpenCL
     def devices
       n = self.num_devices
       ptr2 = FFI::MemoryPointer::new( Device, n )
-      error = OpenCL.clGetProgramInfo(self, Program::DEVICES, Device.size*n, ptr2, nil)
+      error = OpenCL.clGetProgramInfo(self, OpenCL::Program::DEVICES, Device.size*n, ptr2, nil)
       OpenCL.error_check(error)
       return ptr2.get_array_of_pointer(0, n).collect { |device_ptr|
         OpenCL::Device::new(device_ptr)

data/lib/opencl_ruby_ffi/opencl_ruby_ffi_base.rb

@@ -96,7 +96,7 @@ module OpenCL
 
     # Returns a new ChannelType corresponding to the ImageFormat internal value
     def channel_data_type
-      return OpenCL::convert_type(:cl_channel_type)::new(self[:image_channel_data_type])
+      return OpenCL::ChannelType::new(self[:image_channel_data_type])
     end
 
     # Sets the ImageFormat internal value for the image channel data type

data/opencl_ruby_ffi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'opencl_ruby_ffi'
-  s.version = "0.5"
+  s.version = "0.6"
   s.author = "Brice Videau"
   s.email = "brice.videau@imag.fr"
   s.homepage = "https://forge.imag.fr/projects/opencl-ruby/"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opencl_ruby_ffi
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray