opencl_ruby_ffi 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe1596eeb249eb6744106b3bbad55656ab003ec9
-  data.tar.gz: b91178b8e751c28a2412e7cdc8219a8d09e731d0
+  metadata.gz: 84004d4b456d5ea8aabfba8a811565b3b551086a
+  data.tar.gz: 89b78273145a8457c34e61ae6e0fb887f8b19b41
 SHA512:
-  metadata.gz: 93c59bc28c66d2266b8a5bce0d6407597c0f05a355feb93b0dadc44c57b1cb28e401318e637e2e92ab6a124564f8934a26a4652d57e1b85ebbb775e07a4799d1
-  data.tar.gz: 5bb49883a1a101adce60f50c6cf6164da77319068af72b1ed91e6ce9033e714d59626247756bec6b14cc40748e1fd76f83da0b3bd6581bb210274dc84f253713
+  metadata.gz: d799134cb834e51f1782c07c328bebf91dde9cec0134fbe60400ff4a2f79b46a2db38a0e6fbed5db7b5bf1f067a8843453050a22403ba1f5c1ea4130a7296476
+  data.tar.gz: 8b9c3fa63dca70bf13b7deaca5ac4d1291f24b39c6de642edb1e78c483cb86ad8faa6e22daa7b661987724335400a13ab673be908b614a8c0913ab83c5e00093

data/.yardopts

@@ -0,0 +1 @@
+-p templates_custom/ --no-private lib/opencl_ruby_ffi/opencl_ruby_ffi_base_gen.rb lib/opencl_ruby_ffi/opencl_ruby_ffi_base.rb lib/**/*.rb lib/opencl_ruby_ffi/opencl_ruby_ffi_base.rb lib/**/**/*.rb

data/lib/opencl_ruby_ffi.rb

@@ -15,6 +15,8 @@ require "opencl_ruby_ffi/Image.rb"
 require "opencl_ruby_ffi/Sampler.rb"
 require "opencl_ruby_ffi/Pipe.rb"
 require "opencl_ruby_ffi/SVM.rb"
+require "opencl_ruby_ffi/ext.rb"
+require "opencl_ruby_ffi/gl_ext.rb"
 
 require "narray_ffi"
 

data/lib/opencl_ruby_ffi/Buffer.rb

@@ -69,20 +69,25 @@ module OpenCL
   class Buffer < Mem
     layout :dummy, :pointer
 
-    # Creates a Buffer from a sub part of the Buffer
-    #
-    # ==== Attributes
-    #
-    # * +info+ - inf reguarding the type of sub-buffer created. if type == OpenCL::BUFFER_CREATE_TYPE_REGION, info is a BufferRegion
-    # * +tyep+ - type of sub-buffer to create. Only OpenCL::BUFFER_CREATE_TYPE_REGION is supported for now
-    # * +options+ - a hash containing named options
-    #
-    # ==== Options
-    # 
-    # * :flags - a single or an Array of :cl_mem_flags specifying the flags to be used when creating the Buffer
-    def create_sub_buffer( type, region, options = {} )
-      OpenCL.create_sub_buffer( self, type, region, options )
+    module OpenCL11
+      # Creates a Buffer from a sub part of the Buffer
+      #
+      # ==== Attributes
+      #
+      # * +type+ - type of sub-buffer to create. Only OpenCL::BUFFER_CREATE_TYPE_REGION is supported for now
+      # * +info+ - inf reguarding the type of sub-buffer created. if type == OpenCL::BUFFER_CREATE_TYPE_REGION, info is a BufferRegion
+      # * +options+ - a hash containing named options
+      #
+      # ==== Options
+      # 
+      # * +:flags+ - a single or an Array of :cl_mem_flags specifying the flags to be used when creating the Buffer
+      def create_sub_buffer( type, region, options = {} )
+        OpenCL.create_sub_buffer( self, type, region, options )
+      end
     end
+
+    register_extension( :v11,  Buffer::OpenCL11, "platform.version_number >= 1.1" )
+
   end
 
 end

data/lib/opencl_ruby_ffi/CommandQueue.rb

@@ -39,7 +39,7 @@ module OpenCL
     properties = get_command_queue_properties( options )
     size = options[:size]
     error = MemoryPointer::new( :cl_int )
-    if context.platform.version_number < 2.0 then
+    if device.platform.version_number < 2.0 then
       cmd = clCreateCommandQueue( context, device, properties, error )
     else
       props = nil
@@ -85,7 +85,7 @@ module OpenCL
   #
   # the Event associated with the command
   def self.enqueue_migrate_mem_objects( command_queue, mem_objects, options = {} )
-    error_check(INVALID_OPERATION) if command_queue.context.platform.version_number < 1.2
+    error_check(INVALID_OPERATION) if command_queue.device.platform.version_number < 1.2
     num_mem_objects = [mem_objects].flatten.length
     mem_list = nil
     if num_mem_objects > 0 then
@@ -234,7 +234,7 @@ module OpenCL
   #
   # the Event associated with the command
   def self.enqueue_read_buffer_rect( command_queue, buffer, ptr, region, options = {} )
-    error_check(INVALID_OPERATION) if command_queue.context.platform.version_number < 1.1
+    error_check(INVALID_OPERATION) if command_queue.device.platform.version_number < 1.1
     blocking = FALSE
     blocking = TRUE if options[:blocking] or options[:blocking_read]
 
@@ -311,7 +311,7 @@ module OpenCL
   #
   # the Event associated with the command
   def self.enqueue_write_buffer_rect(command_queue, buffer, ptr, region, options = {})
-    error_check(INVALID_OPERATION) if command_queue.context.platform.version_number < 1.1
+    error_check(INVALID_OPERATION) if command_queue.device.platform.version_number < 1.1
     blocking = FALSE
     blocking = TRUE if options[:blocking] or options[:blocking_write]
 
@@ -386,7 +386,7 @@ module OpenCL
   #
   # the Event associated with the command
   def self.enqueue_copy_buffer_rect(command_queue, src_buffer, dst_buffer, region, options = {})
-    error_check(INVALID_OPERATION) if command_queue.context.platform.version_number < 1.1
+    error_check(INVALID_OPERATION) if command_queue.device.platform.version_number < 1.1
 
     src_origin = MemoryPointer::new( :size_t, 3 )
     (0..2).each { |i| src_origin[i].write_size_t(0) }
@@ -623,7 +623,7 @@ module OpenCL
   #
   # the Event associated with the command
   def self.enqueue_fill_buffer( command_queue, buffer, pattern, options = {} )
-    error_check(INVALID_OPERATION) if command_queue.context.platform.version_number < 1.1
+    error_check(INVALID_OPERATION) if command_queue.device.platform.version_number < 1.1
     offset = 0
     offset = options[:offset] if options[:offset]
     pattern_size = pattern.size
@@ -656,7 +656,7 @@ module OpenCL
   #
   # the Event associated with the command
   def self.enqueue_fill_image( command_queue, image, fill_color, options = {} )
-    error_check(INVALID_OPERATION) if command_queue.context.platform.version_number < 1.1
+    error_check(INVALID_OPERATION) if command_queue.device.platform.version_number < 1.1
     origin, region = get_origin_region( image, options, :origin, :region )
     num_events, events = get_event_wait_list( options )
     event = MemoryPointer::new( Event )
@@ -905,7 +905,7 @@ module OpenCL
   #
   # the Event associated with the command
   def self.enqueue_task( command_queue, kernel, options = {} )
-    if queue.context.platform.version_number < 2.0 then
+    if command_queue.device.platform.version_number < 2.0 then
       num_events, events = get_event_wait_list( options )
       event = MemoryPointer::new( Event )
       error = clEnqueueTask( command_queue, kernel, num_events, events, event )
@@ -990,7 +990,7 @@ module OpenCL
   #
   # an Event if implementation version is >= 1.2, nil otherwise
   def self.enqueue_barrier( command_queue, events = [] )
-    if command_queue.context.platform.version_number < 1.2 then
+    if command_queue.device.platform.version_number < 1.2 then
       num_events = [events].flatten.length
       if num_events > 0 then
         evts = MemoryPointer::new( Event, num_events )
@@ -1031,7 +1031,7 @@ module OpenCL
   # an Event
   def self.enqueue_marker( command_queue, events = [] )
     event = MemoryPointer::new( Event )
-    if command_queue.context.platform.version_number < 1.2 then
+    if command_queue.device.platform.version_number < 1.2 then
       error = clEnqueueMarker( command_queue, event )
     else
       num_events = [events].flatten.length
@@ -1051,10 +1051,7 @@ module OpenCL
   # Maps the cl_command_queue object of OpenCL
   class CommandQueue
     include InnerInterface
- 
-    class << self
-      include InnerGenerator
-    end
+    extend InnerGenerator
 
     def inspect
       p = properties
@@ -1077,38 +1074,8 @@ module OpenCL
       return Device::new( ptr.read_pointer )
     end
 
-    # Return the default CommandQueue for the underlying Device
-    def device_default
-      ptr = MemoryPointer::new( CommandQueue )
-      error = OpenCL.clGetCommandQueueInfo(self, DEVICE_DEFAULT, CommandQueue.size, ptr, nil)
-      error_check(error)
-      return CommandQueue::new( ptr.read_pointer )
-    end
-
-    ##
-    # :method: reference_count
-    # Returns the reference count of the CommandQueue
-    eval get_info("CommandQueue", :cl_uint, "REFERENCE_COUNT")
-
-    ##
-    # :method: size
-    # Returns the currently specified size for the command queue (2.0 and for device queue only)
-    eval get_info("CommandQueue", :cl_uint, "SIZE")
-
-    ##
-    # :method: properties
-    # Returns the :cl_command_queue_properties used to create the CommandQueue
-    eval get_info("CommandQueue", :cl_command_queue_properties, "PROPERTIES")
-
-    ##
-    # :method: priority_khr
-    # Returns the :cl_queue_priority_khr used to create the CommandQueue (2.1 and cl_khr_priority_hints required)
-    eval get_info("CommandQueue", :cl_queue_priority_khr, "PRIORITY_KHR")
-
-    ##
-    # :method: throttle_khr
-    # Returns the :cl_queue_throttle_khr used to create the CommandQueue (2.1 and cl_khr_throttle_hints required)
-    eval get_info("CommandQueue", :cl_queue_throttle_khr, "THROTTLE_KHR")
+    get_info("CommandQueue", :cl_uint, "reference_count")
+    get_info("CommandQueue", :cl_command_queue_properties, "properties")
 
     # Enqueues a kernel as a task using the CommandQueue
     #
@@ -1173,34 +1140,6 @@ module OpenCL
       return OpenCL.enqueue_write_buffer( self, buffer, ptr, options )
     end
 
-    # Enqueues a command to write to a rectangular region in a Buffer object from host memory using the CommandQueue
-    #
-    # ==== Attributes
-    # 
-    # * +buffer+ - the Buffer to be written to
-    # * +ptr+ - the Pointer (or convertible to Pointer using to_ptr) to the memory area to use
-    # * +region+ - the region to write in the Buffer
-    # * +options+ - a hash containing named options
-    #
-    # ==== Options
-    #
-    # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
-    # * +:blocking_write+ - if provided indicates if the command blocks until the region is written
-    # * +:blocking+ - if provided indicates if the command blocks until the region is written
-    # * +:buffer_origin+ - if provided indicates the origin inside the buffer of the area to copy, else [0, 0, 0]
-    # * +:host_origin+ - if provided indicates the origin inside the target host area, else [0, 0, 0]
-    # * +:buffer_row_pitch+ - if provided indicates the row pitch inside the buffer, else 0
-    # * +:buffer_slice_pitch+ - if provided indicates the slice pitch inside the buffer, else 0
-    # * +:host_row_pitch+ - if provided indicates the row pitch inside the host area, else 0
-    # * +:host_slice_pitch+ - if provided indicates the slice pitch inside the host area, else 0
-    #
-    # ==== Returns
-    #
-    # the Event associated with the command
-    def enqueue_write_buffer_rect( buffer, ptr, region, options = {} )
-      return OpenCL.enqueue_write_buffer_rect( self, buffer, ptr, region, options )
-    end
-
     # Enqueues a command to read from a Buffer object to host memory using the CommandQueue
     #
     # ==== Attributes
@@ -1224,34 +1163,6 @@ module OpenCL
       return OpenCL.enqueue_read_buffer( self, buffer, ptr, options)
     end
 
-    # Enqueues a command to read from a rectangular region from a Buffer object to host memory using the CommandQueue
-    #
-    # ==== Attributes
-    # 
-    # * +buffer+ - the Buffer to be read from
-    # * +ptr+ - the Pointer (or convertible to Pointer using to_ptr) to the memory area to use
-    # * +region+ - the region in the Buffer to copy
-    # * +options+ - a hash containing named options
-    #
-    # ==== Options
-    #
-    # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
-    # * +:blocking_read+ - if provided indicates if the command blocks until the region is read
-    # * +:blocking+ - if provided indicates if the command blocks until the region is read
-    # * +:buffer_origin+ - if provided indicates the origin inside the buffer of the area to copy, else [0, 0, 0]
-    # * +:host_origin+ - if provided indicates the origin inside the target host area, else [0, 0, 0]
-    # * +:buffer_row_pitch+ - if provided indicates the row pitch inside the buffer, else 0
-    # * +:buffer_slice_pitch+ - if provided indicates the slice pitch inside the buffer, else 0
-    # * +:host_row_pitch+ - if provided indicates the row pitch inside the host area, else 0
-    # * +:host_slice_pitch+ - if provided indicates the slice pitch inside the host area, else 0
-    #
-    # ==== Returns
-    #
-    # the Event associated with the command
-    def enqueue_read_buffer_rect( buffer, ptr, region, options = {} )
-      return OpenCL.enqueue_read_buffer_rect( self, buffer, ptr, region, options )
-    end
-
     # Enqueues a command to copy data from a Buffer object into another Buffer object using the CommandQueue
     #
     # ==== Attributes
@@ -1274,32 +1185,6 @@ module OpenCL
       return OpenCL.enqueue_copy_buffer( self, src_buffer, dst_buffer, options )
     end
 
-    # Enqueues a command to copy a rectangular region into a Buffer object from another Buffer object using the CommandQueue
-    #
-    # ==== Attributes
-    # 
-    # * +src_buffer+ - the Buffer to be read from
-    # * +dst_buffer+ - the Buffer to be written to
-    # * +region+ - the region to write in the Buffer
-    # * +options+ - a hash containing named options
-    #
-    # ==== Options
-    #
-    # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
-    # * +:src_origin+ - if provided indicates the origin inside the src Buffer of the area to copy, else [0, 0, 0]
-    # * +:dst_origin+ - if provided indicates the origin inside the dst Buffer of the area to write to, else [0, 0, 0]
-    # * +:src_row_pitch+ - if provided indicates the row pitch inside the src Buffer, else 0
-    # * +:src_slice_pitch+ - if provided indicates the slice pitch inside the src Buffer, else 0
-    # * +:dst_row_pitch+ - if provided indicates the row pitch inside the dst Buffer, else 0
-    # * +:dst_slice_pitch+ - if provided indicates the slice pitch inside the dst Buffer area, else 0
-    #
-    # ==== Returns
-    #
-    # the Event associated with the command
-    def enqueue_copy_buffer_rect( src_buffer, dst_buffer, region, options = {} )
-      return OpenCL.enqueue_copy_buffer_rect( self, src_buffer, dst_buffer, region, options )
-    end
-
     # Enqueues a barrier on a list of envents using the CommandQueue
     #
     # ==== Attributes
@@ -1455,49 +1340,6 @@ module OpenCL
       return OpenCL.enqueue_copy_image_to_buffer( self, src_image, dst_buffer, options )
     end
 
-    # Enqueues a command to fill an Image with the given color using the CommandQueue
-    #
-    # ==== Attributes
-    # 
-    # * +image+ - an Image object to be filled
-    # * +fill_color+ - the Pointer (or convertible to Pointer using to_ptr) to the memory area where the color is stored
-    # * +options+ - a hash containing named options
-    #
-    # ==== Options
-    #
-    # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
-    # * +:origin+ - if provided indicates the origin of the region to fill inside the Image, else [0, 0, 0]
-    # * +:region+ - if provided indicates the dimension of the region to fill, else the maximum region is filled
-    #
-    # ==== Returns
-    #
-    # the Event associated with the command
-    def enqueue_fill_image( image, fill_color, options = {} )
-      return OpenCL.enqueue_fill_image( self, image, fill_color, options )
-    end
-
-    # Enqueues a command to fill a Buffer with the given pattern using the CommandQueue
-    #
-    # ==== Attributes
-    # 
-    # * +buffer+ - a Buffer object to be filled
-    # * +pattern+ - the Pointer (or convertible to Pointer using to_ptr) to the memory area where the pattern is stored
-    # * +options+ - a hash containing named options
-    #
-    # ==== Options
-    #
-    # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
-    # * +:offset+ - if provided indicates the offset inside the Buffer of the area to be filled, else 0
-    # * +:size+ - if provided indicates the size of data to fill, else the maximum size is filled
-    # * +:pattern_size+ - if provided indicates the size of the pattern, else the maximum pattern data is used
-    #
-    # ==== Returns
-    #
-    # the Event associated with the command
-    def enqueue_fill_buffer( buffer, pattern, options = {} )
-      return OpenCL.enqueue_fill_buffer( self, buffer, pattern, options )
-    end
-
     # Acquire OpenCL Mem objects that have been created from OpenGL objects using the CommandQueue
     #
     # ==== Attributes
@@ -1607,25 +1449,6 @@ module OpenCL
       return OpenCL.enqueue_unmap_mem_object( self, mem_obj, mapped_ptr, options )
     end
 
-    # Enqueues a command to indicate which device a set of memory objects should be migrated to using the CommandQueue
-    #
-    # ==== Attributes
-    # 
-    # * +mem_objects+ - the Mem objects to migrate
-    # * +options+ - a hash containing named options
-    #
-    # ==== Options
-    #
-    # * +:flags+ - a single or an Array of :cl_mem_migration flags
-    # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
-    #
-    # ==== Returns
-    #
-    # the Event associated with the command
-    def enqueue_migrate_mem_objects( mem_objects, options = {} )
-      return OpenCL.enqueue_migrate_mem_objects( self, mem_objects, options )
-    end
-
     # Enqueues a native kernel in the CommandQueue
     #
     # ==== Attributes
@@ -1656,127 +1479,303 @@ module OpenCL
       return OpenCL.flush( self )
     end
 
-    # Enqueues a command to copy from or to an SVMPointer using the CommandQueue
-    #
-    # ==== Attributes
-    # 
-    # * +dst_ptr+ - the Pointer (or convertible to Pointer using to_ptr) or SVMPointer to be written to
-    # * +src_ptr+ - the Pointer (or convertible to Pointer using to_ptr) or SVMPointer to be read from
-    # * +size+ - the size of data to copy
-    # * +options+ - a hash containing named options
-    #
-    # ==== Options
-    #
-    # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
-    # * +:blocking_copy+ - if provided indicates if the command blocks until the copy finishes
-    # * +:blocking+ - if provided indicates if the command blocks until the copy finishes
-    #
-    # ==== Returns
-    #
-    # the Event associated with the command
-    def enqueue_svm_memcpy( dst_ptr, src_ptr, size, options = {})
-      return OpenCL.enqueue_svm_memcpy(self, dst_ptr, src_ptr, size, options)
-    end
+    module OpenCL11
+
+      # Enqueues a command to read from a rectangular region from a Buffer object to host memory using the CommandQueue
+      #
+      # ==== Attributes
+      # 
+      # * +buffer+ - the Buffer to be read from
+      # * +ptr+ - the Pointer (or convertible to Pointer using to_ptr) to the memory area to use
+      # * +region+ - the region in the Buffer to copy
+      # * +options+ - a hash containing named options
+      #
+      # ==== Options
+      #
+      # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
+      # * +:blocking_read+ - if provided indicates if the command blocks until the region is read
+      # * +:blocking+ - if provided indicates if the command blocks until the region is read
+      # * +:buffer_origin+ - if provided indicates the origin inside the buffer of the area to copy, else [0, 0, 0]
+      # * +:host_origin+ - if provided indicates the origin inside the target host area, else [0, 0, 0]
+      # * +:buffer_row_pitch+ - if provided indicates the row pitch inside the buffer, else 0
+      # * +:buffer_slice_pitch+ - if provided indicates the slice pitch inside the buffer, else 0
+      # * +:host_row_pitch+ - if provided indicates the row pitch inside the host area, else 0
+      # * +:host_slice_pitch+ - if provided indicates the slice pitch inside the host area, else 0
+      #
+      # ==== Returns
+      #
+      # the Event associated with the command
+      def enqueue_read_buffer_rect( buffer, ptr, region, options = {} )
+        return OpenCL.enqueue_read_buffer_rect( self, buffer, ptr, region, options )
+      end
 
-    # Enqueues a command that frees SVMPointers (or Pointers using a callback) using the CommandQueue
-    #
-    # ==== Attributes
-    # 
-    # * +svm_pointer+ - a single or an Array of SVMPointer (or Pointer)
-    # * +options+ - a hash containing named options
-    # * +block+ - if provided, a callback invoked to free the pointers. Signature of the callback is { |CommandQueue, num_pointers, Pointer to an array of num_pointers Pointers, Pointer to user_data| ... }
-    #
-    # ==== Options
-    #
-    # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
-    # * +:user_data+ - if provided, a Pointer (or convertible to using to_ptr) that will be passed to the callback
-    #
-    # ==== Returns
-    #
-    # the Event associated with the command
-    def enqueue_svm_free(svm_pointers, options = {}, &block)
-      return OpenCL.enqueue_svm_free(self, svm_pointers, options, &block)
-    end
+      # Enqueues a command to write to a rectangular region in a Buffer object from host memory using the CommandQueue
+      #
+      # ==== Attributes
+      # 
+      # * +buffer+ - the Buffer to be written to
+      # * +ptr+ - the Pointer (or convertible to Pointer using to_ptr) to the memory area to use
+      # * +region+ - the region to write in the Buffer
+      # * +options+ - a hash containing named options
+      #
+      # ==== Options
+      #
+      # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
+      # * +:blocking_write+ - if provided indicates if the command blocks until the region is written
+      # * +:blocking+ - if provided indicates if the command blocks until the region is written
+      # * +:buffer_origin+ - if provided indicates the origin inside the buffer of the area to copy, else [0, 0, 0]
+      # * +:host_origin+ - if provided indicates the origin inside the target host area, else [0, 0, 0]
+      # * +:buffer_row_pitch+ - if provided indicates the row pitch inside the buffer, else 0
+      # * +:buffer_slice_pitch+ - if provided indicates the slice pitch inside the buffer, else 0
+      # * +:host_row_pitch+ - if provided indicates the row pitch inside the host area, else 0
+      # * +:host_slice_pitch+ - if provided indicates the slice pitch inside the host area, else 0
+      #
+      # ==== Returns
+      #
+      # the Event associated with the command
+      def enqueue_write_buffer_rect( buffer, ptr, region, options = {} )
+        return OpenCL.enqueue_write_buffer_rect( self, buffer, ptr, region, options )
+      end
+
+      # Enqueues a command to copy a rectangular region into a Buffer object from another Buffer object using the CommandQueue
+      #
+      # ==== Attributes
+      # 
+      # * +src_buffer+ - the Buffer to be read from
+      # * +dst_buffer+ - the Buffer to be written to
+      # * +region+ - the region to write in the Buffer
+      # * +options+ - a hash containing named options
+      #
+      # ==== Options
+      #
+      # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
+      # * +:src_origin+ - if provided indicates the origin inside the src Buffer of the area to copy, else [0, 0, 0]
+      # * +:dst_origin+ - if provided indicates the origin inside the dst Buffer of the area to write to, else [0, 0, 0]
+      # * +:src_row_pitch+ - if provided indicates the row pitch inside the src Buffer, else 0
+      # * +:src_slice_pitch+ - if provided indicates the slice pitch inside the src Buffer, else 0
+      # * +:dst_row_pitch+ - if provided indicates the row pitch inside the dst Buffer, else 0
+      # * +:dst_slice_pitch+ - if provided indicates the slice pitch inside the dst Buffer area, else 0
+      #
+      # ==== Returns
+      #
+      # the Event associated with the command
+      def enqueue_copy_buffer_rect( src_buffer, dst_buffer, region, options = {} )
+        return OpenCL.enqueue_copy_buffer_rect( self, src_buffer, dst_buffer, region, options )
+      end
 
-    # Enqueues a command to fill a an SVM memory area using the CommandQueue
-    #
-    # ==== Attributes
-    #
-    # * +svm_ptr+ - the SVMPointer to the area to fill
-    # * +pattern+ - the Pointer (or convertible to Pointer using to_ptr) to the memory area where the pattern is stored
-    # * +size+ - the size of the area to fill
-    #
-    # ==== Options
-    #
-    # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
-    # * +:pattern_size+ - if provided indicates the size of the pattern, else the maximum pattern data is used
-    #
-    # ==== Returns
-    #
-    # the Event associated with the command
-    def enqueue_svm_memfill(command_queue, svm_ptr, pattern, size, options = {})
-      return OpenCL.enqueue_svm_memfill(self, svm_ptr, pattern, size, options)
     end
 
-    # Enqueues a command to map an Image into host memory using the CommandQueue
-    #
-    # ==== Attributes
-    # 
-    # * +svm_ptr+ - the SVMPointer to the area to map
-    # * +size+ - the size of the region to map
-    # * +map_flags+ - a single or an Array of :cl_map_flags flags
-    # * +options+ - a hash containing named options
-    #
-    # ==== Options
-    #
-    # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
-    # * +:blocking_map+ - if provided indicates if the command blocks until the region is mapped
-    # * +:blocking+ - if provided indicates if the command blocks until the region is mapped
-    #
-    # ==== Returns
-    #
-    # the Event associated with the command
-    def enqueue_svm_map( svm_ptr, size, map_flags, options = {} )
-      return OpenCL.enqueue_svm_map( self, svm_ptr, size, map_flags, options )
+    module OpenCL12
+
+      # Enqueues a command to fill a Buffer with the given pattern using the CommandQueue
+      #
+      # ==== Attributes
+      # 
+      # * +buffer+ - a Buffer object to be filled
+      # * +pattern+ - the Pointer (or convertible to Pointer using to_ptr) to the memory area where the pattern is stored
+      # * +options+ - a hash containing named options
+      #
+      # ==== Options
+      #
+      # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
+      # * +:offset+ - if provided indicates the offset inside the Buffer of the area to be filled, else 0
+      # * +:size+ - if provided indicates the size of data to fill, else the maximum size is filled
+      # * +:pattern_size+ - if provided indicates the size of the pattern, else the maximum pattern data is used
+      #
+      # ==== Returns
+      #
+      # the Event associated with the command
+      def enqueue_fill_buffer( buffer, pattern, options = {} )
+        return OpenCL.enqueue_fill_buffer( self, buffer, pattern, options )
+      end
+
+      # Enqueues a command to fill an Image with the given color using the CommandQueue
+      #
+      # ==== Attributes
+      # 
+      # * +image+ - an Image object to be filled
+      # * +fill_color+ - the Pointer (or convertible to Pointer using to_ptr) to the memory area where the color is stored
+      # * +options+ - a hash containing named options
+      #
+      # ==== Options
+      #
+      # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
+      # * +:origin+ - if provided indicates the origin of the region to fill inside the Image, else [0, 0, 0]
+      # * +:region+ - if provided indicates the dimension of the region to fill, else the maximum region is filled
+      #
+      # ==== Returns
+      #
+      # the Event associated with the command
+      def enqueue_fill_image( image, fill_color, options = {} )
+        return OpenCL.enqueue_fill_image( self, image, fill_color, options )
+      end
+
+      # Enqueues a command to indicate which device a set of memory objects should be migrated to using the CommandQueue
+      #
+      # ==== Attributes
+      # 
+      # * +mem_objects+ - the Mem objects to migrate
+      # * +options+ - a hash containing named options
+      #
+      # ==== Options
+      #
+      # * +:flags+ - a single or an Array of :cl_mem_migration flags
+      # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
+      #
+      # ==== Returns
+      #
+      # the Event associated with the command
+      def enqueue_migrate_mem_objects( mem_objects, options = {} )
+        return OpenCL.enqueue_migrate_mem_objects( self, mem_objects, options )
+      end
+
     end
-  
-    # Enqueues a command to unmap a previously mapped SVM memory area using the CommandQueue
-    #
-    # ==== Attributes
-    # 
-    # * +svm_ptr+ - the SVMPointer of the area to be unmapped
-    # * +options+ - a hash containing named options
-    #
-    # ==== Options
-    #
-    # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
-    #
-    # ==== Returns
-    #
-    # the Event associated with the command
-    def enqueue_svm_unmap( svm_ptr, options = {} )
-      return OpenCL.enqueue_svm_unmap( self, svm_ptr, options )
+
+    module OpenCL20
+      extend InnerGenerator
+
+      get_info("CommandQueue", :cl_uint, "size")
+
+      # Enqueues a command to copy from or to an SVMPointer using the CommandQueue
+      #
+      # ==== Attributes
+      # 
+      # * +dst_ptr+ - the Pointer (or convertible to Pointer using to_ptr) or SVMPointer to be written to
+      # * +src_ptr+ - the Pointer (or convertible to Pointer using to_ptr) or SVMPointer to be read from
+      # * +size+ - the size of data to copy
+      # * +options+ - a hash containing named options
+      #
+      # ==== Options
+      #
+      # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
+      # * +:blocking_copy+ - if provided indicates if the command blocks until the copy finishes
+      # * +:blocking+ - if provided indicates if the command blocks until the copy finishes
+      #
+      # ==== Returns
+      #
+      # the Event associated with the command
+      def enqueue_svm_memcpy( dst_ptr, src_ptr, size, options = {})
+        return OpenCL.enqueue_svm_memcpy(self, dst_ptr, src_ptr, size, options)
+      end
+
+      # Enqueues a command that frees SVMPointers (or Pointers using a callback) using the CommandQueue
+      #
+      # ==== Attributes
+      # 
+      # * +svm_pointer+ - a single or an Array of SVMPointer (or Pointer)
+      # * +options+ - a hash containing named options
+      # * +block+ - if provided, a callback invoked to free the pointers. Signature of the callback is { |CommandQueue, num_pointers, Pointer to an array of num_pointers Pointers, Pointer to user_data| ... }
+      #
+      # ==== Options
+      #
+      # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
+      # * +:user_data+ - if provided, a Pointer (or convertible to using to_ptr) that will be passed to the callback
+      #
+      # ==== Returns
+      #
+      # the Event associated with the command
+      def enqueue_svm_free(svm_pointers, options = {}, &block)
+        return OpenCL.enqueue_svm_free(self, svm_pointers, options, &block)
+      end
+
+      # Enqueues a command to fill a an SVM memory area using the CommandQueue
+      #
+      # ==== Attributes
+      #
+      # * +svm_ptr+ - the SVMPointer to the area to fill
+      # * +pattern+ - the Pointer (or convertible to Pointer using to_ptr) to the memory area where the pattern is stored
+      # * +size+ - the size of the area to fill
+      #
+      # ==== Options
+      #
+      # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
+      # * +:pattern_size+ - if provided indicates the size of the pattern, else the maximum pattern data is used
+      #
+      # ==== Returns
+      #
+      # the Event associated with the command
+      def enqueue_svm_memfill(command_queue, svm_ptr, pattern, size, options = {})
+        return OpenCL.enqueue_svm_memfill(self, svm_ptr, pattern, size, options)
+      end
+
+      # Enqueues a command to map an Image into host memory using the CommandQueue
+      #
+      # ==== Attributes
+      # 
+      # * +svm_ptr+ - the SVMPointer to the area to map
+      # * +size+ - the size of the region to map
+      # * +map_flags+ - a single or an Array of :cl_map_flags flags
+      # * +options+ - a hash containing named options
+      #
+      # ==== Options
+      #
+      # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
+      # * +:blocking_map+ - if provided indicates if the command blocks until the region is mapped
+      # * +:blocking+ - if provided indicates if the command blocks until the region is mapped
+      #
+      # ==== Returns
+      #
+      # the Event associated with the command
+      def enqueue_svm_map( svm_ptr, size, map_flags, options = {} )
+        return OpenCL.enqueue_svm_map( self, svm_ptr, size, map_flags, options )
+      end
+    
+      # Enqueues a command to unmap a previously mapped SVM memory area using the CommandQueue
+      #
+      # ==== Attributes
+      # 
+      # * +svm_ptr+ - the SVMPointer of the area to be unmapped
+      # * +options+ - a hash containing named options
+      #
+      # ==== Options
+      #
+      # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
+      #
+      # ==== Returns
+      #
+      # the Event associated with the command
+      def enqueue_svm_unmap( svm_ptr, options = {} )
+        return OpenCL.enqueue_svm_unmap( self, svm_ptr, options )
+      end
+
     end
 
-    # Enqueues a command to migrate SVM memory area
-    # ==== Attributes
-    #
-    # * +svm_ptrs+ - a single or an Array of SVM memory area to migrate
-    # * +options+ - a hash containing named options
-    #
-    # ==== Options
-    #
-    # * +:sizes+ - a single or an Array of sizes to transfer
-    # * +:flags+ - a single or an Array of :cl_mem_migration flags
-    # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
-    #
-    # ==== Returns
-    #
-    # the Event associated with the command
-    def enqueue_svm_migrate_mem( svn_ptrs, options = {} )
-      return OpenCL.enqueue_svm_migrate_mem( self, svn_ptrs, options = {} )
+    module OpenCL21
+
+      # Return the default CommandQueue for the underlying Device
+      def device_default
+        ptr = MemoryPointer::new( CommandQueue )
+        error = OpenCL.clGetCommandQueueInfo(self, DEVICE_DEFAULT, CommandQueue.size, ptr, nil)
+        error_check(error)
+        return CommandQueue::new( ptr.read_pointer )
+      end
+
+      # Enqueues a command to migrate SVM memory area
+      # ==== Attributes
+      #
+      # * +svm_ptrs+ - a single or an Array of SVM memory area to migrate
+      # * +options+ - a hash containing named options
+      #
+      # ==== Options
+      #
+      # * +:sizes+ - a single or an Array of sizes to transfer
+      # * +:flags+ - a single or an Array of :cl_mem_migration flags
+      # * +:event_wait_list+ - if provided, a list of Event to wait upon before executing the command
+      #
+      # ==== Returns
+      #
+      # the Event associated with the command
+      def enqueue_svm_migrate_mem( svn_ptrs, options = {} )
+        return OpenCL.enqueue_svm_migrate_mem( self, svn_ptrs, options = {} )
+      end
+
     end
 
+    register_extension( :v11, OpenCL11, "device.platform.version_number >= 1.1" )
+    register_extension( :v12, OpenCL12, "device.platform.version_number >= 1.2" )
+    register_extension( :v20, OpenCL20, "device.platform.version_number >= 2.0" )
+    register_extension( :v21, OpenCL21, "device.platform.version_number >= 2.1" )
+
   end
 
 end