opencl_ruby_ffi 0.95 → 0.96

data/lib/opencl_ruby_ffi/Program.rb

@@ -212,9 +212,9 @@ module OpenCL
       c_strs[i].write_pointer(p)
       c_strs_length[i].write_size_t(p.size)
     }
-    pointer_err = FFI::MemoryPointer::new( :cl_int )
-    program_ptr = OpenCL.clCreateProgramWithSource(context, c_strs_p.size, c_strs, c_strs_length, pointer_err)
-    OpenCL.error_check(pointer_err.read_cl_int)
+    error = FFI::MemoryPointer::new( :cl_int )
+    program_ptr = OpenCL.clCreateProgramWithSource(context, c_strs_p.size, c_strs, c_strs_length, error)
+    OpenCL.error_check(error.read_cl_int)
     return OpenCL::Program::new( program_ptr, false )
   end
 
@@ -260,6 +260,18 @@ module OpenCL
     # Returns the concatenated Program sources
     eval OpenCL.get_info("Program", :string, "SOURCE")
 
+    # Returns the total amount in byte used by the Program variables in the global address space for the Device(s) specified. Returns an Array of tuple [ Device, size ] (2.0 only)
+    def build_global_variable_total_size(devs = nil)
+      devs = self.devices if not devs
+      devs = [devs].flatten
+      ptr = FFI::MemoryPointer::new( :size_t )
+      return devs.collect { |dev|
+        error = OpenCL.clGetProgramBuildInfo(self, dev, OpenCL::Program::BUILD_GLOBAL_VARIABLE_TOTAL_SIZE, ptr.size, ptr, nil)
+        OpenCL.error_check(error)
+        [dev, ptr.read_size_t]
+      }
+    end
+
     # Returns the BuildStatus of the Program for each device associated to the Program or the Device(s) specified. Returns an Array of tuple [ Device, BuildStatus ]
     def build_status(devs = nil)
       devs = self.devices if not devs

data/lib/opencl_ruby_ffi/SVM.rb

@@ -0,0 +1,184 @@
+module OpenCL
+
+  # maps the SVM pointer type
+  class SVMPointer < FFI::Pointer
+
+    def initialize( address, context )
+      super( address )
+      @context = context
+    end
+
+    def +( offset )
+      return OpenCL::SVMPointer::new(  self.address + offset, @context )
+    end
+
+    def free
+      return OpenCL::svm_free( @context, self )
+    end
+
+  end
+
+  def self.svm_alloc(context, size, options = {})
+    OpenCL.error_check(OpenCL::INVALID_OPERATION) if context.platform.version_number < 2.0
+    flags = OpenCL::get_flags(options)
+    alignment = 0
+    alignment = options[:alignment] if options[:alignment]
+    ptr = OpenCL.clSVMAlloc( context, flags, size, alignment )
+    raise OpenCL::Error::new(OpenCL::Error.getErrorString(OpenCL::Error::MEM_OBJECT_ALLOCATION_FAILURE)) if ptr.null?
+    return OpenCL::SVMPointer::new( ptr, context )
+  end
+
+  def self.svm_free(context, svm_pointer)
+    OpenCL.error_check(OpenCL::INVALID_OPERATION) if context.platform.version_number < 2.0
+    return OpenCL.clSVMFree( context, svm_pointer )
+  end
+
+  # Set the index th argument of Kernel to value. Value must be within a SVM memory area
+  def self.set_kernel_arg_svm_pointer( kernel, index, value )
+    OpenCL.error_check(OpenCL::INVALID_OPERATION) if kernel.context.platform.version_number < 2.0
+    error = OpenCL.clSetKernelArgSVMPointer( kernel, index, val )
+    OpenCL.error_check(error)
+  end
+
+  # Enqueues a command that frees SVMPointers (or Pointers using a callback)
+  #
+  # ==== Attributes
+  # 
+  # * +command_queue+ - CommandQueue used to execute the write command
+  # * +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, FFI::Pointer to an array of num_pointers Pointers, FFI::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 self.enqueue_svm_free(command_queue, svm_pointers, options = {}, &block)
+    pointers = [svm_pointers].flatten
+    num_pointers = pointers.length
+    ptr = FFI::MemoryPointer::new( :pointer, num_pointers)
+    pointers.each_with_index { |p, indx|
+      ptr[indx].write_pointer(p)
+    }
+    num_events, events = OpenCL.get_event_wait_list( options )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
+    error = OpenCL.clEnqueueSVMFree(command_queue, num_pointers, ptr, block, options[:user_data], num_events, events, event)
+    OpenCL.error_check(error)
+    return OpenCL::Event::new(event.read_pointer, false)
+  end
+
+  # Enqueues a command to copy from or to an SVMPointer
+  #
+  # ==== Attributes
+  # 
+  # * +command_queue+ - CommandQueue used to execute the write command
+  # * +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 self.enqueue_svm_memcpy(command_queue, dst_ptr, src_ptr, size, options = {})
+    OpenCL.error_check(OpenCL::INVALID_OPERATION) if command_queue.context.platform.version_number < 2.0
+    blocking = OpenCL::FALSE
+    blocking = OpenCL::TRUE if options[:blocking] or options[:blocking_copy]
+    num_events, events = OpenCL.get_event_wait_list( options )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
+    error = OpenCL.clEnqueueSVMMemcpy(command_queue, blocking, dst_ptr, src_ptr, size, num_events, events, event)
+    OpenCL.error_check(error)
+    return OpenCL::Event::new(event.read_pointer, false)
+  end
+
+  # Enqueues a command to fill a an SVM memory area
+  #
+  # ==== Attributes
+  #
+  # * +command_queue+ - CommandQueue used to execute the write command
+  # * +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 self.enqueue_svm_fill(command_queue, svm_ptr, pattern, size, options = {})
+    num_events, events = OpenCL.get_event_wait_list( options )
+    pattern_size = pattern.size
+    pattern_size = options[:pattern_size] if options[:pattern_size]
+    event = FFI::MemoryPointer::new( OpenCL::Event )
+    error = OpenCL.clEnqueueSVMFill(command_queue, svm_ptr, pattern, pattern_size, size, num_events, events, event)
+    OpenCL.error_check(error)
+    return OpenCL::Event::new(event.read_pointer, false)
+  end
+
+  # Enqueues a command to map an Image into host memory
+  #
+  # ==== Attributes
+  # 
+  # * +command_queue+ - CommandQueue used to execute the map command
+  # * +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 self.enqueue_svm_map( command_queue, svm_ptr, size, map_flags, options = {} )
+    blocking = OpenCL::FALSE
+    blocking = OpenCL::TRUE if options[:blocking] or options[:blocking_map]
+    flags = OpenCL.get_flags( {:flags => map_flags} )
+    num_events, events = OpenCL.get_event_wait_list( options )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
+    error = OpenCL.clEnqueueSVMMap( command_queue, blocking, flags, svm_ptr, size, num_events, events, event )
+    OpenCL.error_check( error.read_cl_int )
+    return OpenCL::Event::new( event.read_ptr, false )
+  end
+
+  # Enqueues a command to unmap a previously mapped SVM memory area
+  #
+  # ==== Attributes
+  # 
+  # * +command_queue+ - CommandQueue used to execute the unmap command
+  # * +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 self.enqueue_svm_unmap( command_queue, svm_ptr, options = {} )
+    num_events, events = OpenCL.get_event_wait_list( options )
+    event = FFI::MemoryPointer::new( OpenCL::Event )
+    error = OpenCL.clEnqueueSVMUnmap( command_queue, svm_ptr, num_events, events, event )
+    OpenCL.error_check( error )
+    return OpenCL::Event::new( event.read_ptr, false )
+  end
+
+end

data/lib/opencl_ruby_ffi/Sampler.rb

@@ -5,12 +5,56 @@ module OpenCL
   # ==== Attributes
   #
   # * +context+ - Context the created Sampler will be associated to
-  # * +normalized_coords+ - a :cl_bool specifying if the image coordinates are normalized
-  # * +addressing_mode+ - a :cl_addressing_mode specifying how out-of-range image coordinates are handled when reading from an image
-  # * +filter_mode+ - a :cl_filter_mode specifying the type of filter that must be applied when reading an image
-  def self.create_sampler( context, normalized_coords, addressing_mode, filter_mode )
+  #
+  # ==== Options
+  #
+  # * +:normalized_coords+ - a :cl_bool specifying if the image coordinates are normalized
+  # * +:addressing_mode+ - a :cl_addressing_mode specifying how out-of-range image coordinates are handled when reading from an image
+  # * +:filter_mode+ - a :cl_filter_mode specifying the type of filter that must be applied when reading an image
+  # * +:mip_filter_mode+ - the filtering mode to use if using mimaps (default CL_FILTER_NONE, requires cl_khr_mipmap_image)
+  # * +:lod_min+ - floating point value representing the minimal LOD (default 0.0f, requires cl_khr_mipmap_image)
+  # * +:lod_max+ - floating point value representing the maximal LOD (default MAXFLOAT, requires cl_khr_mipmap_image)
+  def self.create_sampler( context, options = {} )
+    normalized_coords = OpenCL::TRUE
+    normalized_coords = options[:normalized_coords] if options[:normalized_coords]
+    addressing_mode = OpenCL::AddressingMode::CLAMP
+    addressing_mode = options[:addressing_mode] if options[:addressing_mode]
+    filter_mode = OpenCL::FilterMode::NEAREST
+    filter_mode = options[:filter_mode] if options[:filter_mode]
     error = FFI::MemoryPointer::new( :cl_int )
-    sampler_ptr = OpenCL.clCreateSampler( context, normalized_coords, addressing_mode, filter_mode, error )
+    if context.platform.version_number < 2.0 then
+      sampler_ptr = OpenCL.clCreateSampler( context, normalized_coords, addressing_mode, filter_mode, error )
+    else
+      prop_size = 7
+      prop_size += 2 if options[:mip_filter_mode]
+      prop_size += 2 if options[:lod_min]
+      prop_size += 2 if options[:lod_max]
+      properties = FFI::MemoryPointer::new( :cl_sampler_properties)
+      properties[0].write_cl_sampler_properties( OpenCL::Sampler::NORMALIZED_COORDS )
+      properties[1].write_cl_sampler_properties( normalized_coords )
+      properties[2].write_cl_sampler_properties( OpenCL::Sampler::ADDRESSING_MODE )
+      properties[3].write_cl_sampler_properties( addressing_mode )
+      properties[4].write_cl_sampler_properties( OpenCL::Sampler::FILTER_MODE )
+      properties[5].write_cl_sampler_properties( filter_mode )
+      prop_indx = 6
+      if options[:mip_filter_mode] then
+        properties[prop_indx].write_cl_sampler_properties( OpenCL::Sampler::MIP_FILTER_MODE )
+        properties[prop_indx+1].write_cl_sampler_properties( options[:mip_filter_mode] )
+        prop_indx += 2
+      end
+      if options[:lod_min] then
+        properties[prop_indx].write_cl_sampler_properties( OpenCL::Sampler::LOD_MIN )
+        properties[prop_indx+1].write_float( options[:lod_min] )
+        prop_indx += 2
+      end
+      if options[:lod_max] then
+        properties[prop_indx].write_cl_sampler_properties( OpenCL::Sampler::LOD_MAX )
+        properties[prop_indx+1].write_float( options[:lod_max] )
+        prop_indx += 2
+      end
+      properties[prop_indx].write_cl_sampler_properties( 0 )
+      sampler_ptr = OpenCL.clCreateSamplerWithProperties( context, properties, error )
+    end
     OpenCL.error_check(error.read_cl_int)
     OpenCL::Sampler::new(sampler_ptr, false)
   end

data/lib/opencl_ruby_ffi/opencl_ruby_ffi_base.rb

@@ -44,6 +44,7 @@ module OpenCL
     :cl_device_exec_capabilities => OpenCL::Device::ExecCapabilities,
     :cl_command_queue_properties => OpenCL::CommandQueue::Properties,
     :cl_device_affinity_domain => OpenCL::Device::AffinityDomain,
+    :cl_device_svm_capabilities => OpenCL::Device::SVMCapabilities,
     :cl_channel_order => OpenCL::ChannelOrder,
     :cl_channel_type => OpenCL::ChannelType,
     :cl_mem_flags => OpenCL::Mem::Flags,
@@ -195,12 +196,12 @@ module OpenCL
 
   # Extracts the :properties named option (for a CommandQueue) from the hash given and returns the properties values
   def self.get_command_queue_properties( options )
-    properties = 0
+    properties = OpenCL::CommandQueue::Properties::new(0)
     if options[:properties] then
       if options[:properties].respond_to?(:each) then
         options[:properties].each { |f| properties = properties | f }
       else
-        properties = options[:properties]
+        properties = properties | options[:properties]
       end
     end
     return properties

data/lib/opencl_ruby_ffi/opencl_ruby_ffi_base_gen.rb

@@ -67,9 +67,12 @@ module OpenCL
   INVALID_COMPILER_OPTIONS = -66
   INVALID_LINKER_OPTIONS = -67
   INVALID_DEVICE_PARTITION_COUNT = -68
+  INVALID_PIPE_SIZE = -69
+  INVALID_DEVICE_QUEUE = -70
   VERSION_1_0 = 1
   VERSION_1_1 = 1
   VERSION_1_2 = 1
+  VERSION_2_0 = 1
   FALSE = 0
   TRUE = 1
   BLOCKING = TRUE
@@ -128,6 +131,7 @@ module OpenCL
   DEVICE_COMPILER_AVAILABLE = 0x1028
   DEVICE_EXECUTION_CAPABILITIES = 0x1029
   DEVICE_QUEUE_PROPERTIES = 0x102A
+  DEVICE_QUEUE_ON_HOST_PROPERTIES = 0x102A
   DEVICE_NAME = 0x102B
   DEVICE_VENDOR = 0x102C
   DRIVER_VERSION = 0x102D
@@ -160,6 +164,21 @@ module OpenCL
   DEVICE_PRINTF_BUFFER_SIZE = 0x1049
   DEVICE_IMAGE_PITCH_ALIGNMENT = 0x104A
   DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT = 0x104B
+  DEVICE_MAX_READ_WRITE_IMAGE_ARGS = 0x104C
+  DEVICE_MAX_GLOBAL_VARIABLE_SIZE = 0x104D
+  DEVICE_QUEUE_ON_DEVICE_PROPERTIES = 0x104E
+  DEVICE_QUEUE_ON_DEVICE_PREFERRED_SIZE = 0x104F
+  DEVICE_QUEUE_ON_DEVICE_MAX_SIZE = 0x1050
+  DEVICE_MAX_ON_DEVICE_QUEUES = 0x1051
+  DEVICE_MAX_ON_DEVICE_EVENTS = 0x1052
+  DEVICE_SVM_CAPABILITIES = 0x1053
+  DEVICE_GLOBAL_VARIABLE_PREFERRED_TOTAL_SIZE = 0x1054
+  DEVICE_MAX_PIPE_ARGS = 0x1055
+  DEVICE_PIPE_MAX_ACTIVE_RESERVATIONS = 0x1056
+  DEVICE_PIPE_MAX_PACKET_SIZE = 0x1057
+  DEVICE_PREFERRED_PLATFORM_ATOMIC_ALIGNMENT = 0x1058
+  DEVICE_PREFERRED_GLOBAL_ATOMIC_ALIGNMENT = 0x1059
+  DEVICE_PREFERRED_LOCAL_ATOMIC_ALIGNMENT = 0x105A
   FP_DENORM = (1 << 0)
   FP_INF_NAN = (1 << 1)
   FP_ROUND_TO_NEAREST = (1 << 2)
@@ -177,6 +196,8 @@ module OpenCL
   EXEC_NATIVE_KERNEL = (1 << 1)
   QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE = (1 << 0)
   QUEUE_PROFILING_ENABLE = (1 << 1)
+  QUEUE_ON_DEVICE = (1 << 2)
+  QUEUE_ON_DEVICE_DEFAULT = (1 << 3)
   CONTEXT_REFERENCE_COUNT = 0x1080
   CONTEXT_DEVICES = 0x1081
   CONTEXT_PROPERTIES = 0x1082
@@ -193,10 +214,15 @@ module OpenCL
   DEVICE_AFFINITY_DOMAIN_L2_CACHE = (1 << 3)
   DEVICE_AFFINITY_DOMAIN_L1_CACHE = (1 << 4)
   DEVICE_AFFINITY_DOMAIN_NEXT_PARTITIONABLE = (1 << 5)
+  DEVICE_SVM_COARSE_GRAIN_BUFFER = (1 << 0)
+  DEVICE_SVM_FINE_GRAIN_BUFFER = (1 << 1)
+  DEVICE_SVM_FINE_GRAIN_SYSTEM = (1 << 2)
+  DEVICE_SVM_ATOMICS = (1 << 3)
   QUEUE_CONTEXT = 0x1090
   QUEUE_DEVICE = 0x1091
   QUEUE_REFERENCE_COUNT = 0x1092
   QUEUE_PROPERTIES = 0x1093
+  QUEUE_SIZE = 0x1094
   MEM_READ_WRITE = (1 << 0)
   MEM_WRITE_ONLY = (1 << 1)
   MEM_READ_ONLY = (1 << 2)
@@ -206,6 +232,8 @@ module OpenCL
   MEM_HOST_WRITE_ONLY = (1 << 7)
   MEM_HOST_READ_ONLY = (1 << 8)
   MEM_HOST_NO_ACCESS = (1 << 9)
+  MEM_SVM_FINE_GRAIN_BUFFER = (1 << 10)
+  MEM_SVM_ATOMICS = (1 << 11)
   MIGRATE_MEM_OBJECT_HOST = (1 << 0)
   MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED = (1 << 1)
   R = 0x10B0
@@ -223,6 +251,11 @@ module OpenCL
   RGBx = 0x10BC
   DEPTH = 0x10BD
   DEPTH_STENCIL = 0x10BE
+  sRGB = 0x10BF
+  sRGBx = 0x10C0
+  sRGBA = 0x10C1
+  sBGRA = 0x10C2
+  ABGR = 0x10C3
   SNORM_INT8 = 0x10D0
   SNORM_INT16 = 0x10D1
   UNORM_INT8 = 0x10D2
@@ -246,6 +279,7 @@ module OpenCL
   MEM_OBJECT_IMAGE1D = 0x10F4
   MEM_OBJECT_IMAGE1D_ARRAY = 0x10F5
   MEM_OBJECT_IMAGE1D_BUFFER = 0x10F6
+  MEM_OBJECT_PIPE = 0x10F7
   MEM_TYPE = 0x1100
   MEM_FLAGS = 0x1101
   MEM_SIZE = 0x1102
@@ -255,6 +289,7 @@ module OpenCL
   MEM_CONTEXT = 0x1106
   MEM_ASSOCIATED_MEMOBJECT = 0x1107
   MEM_OFFSET = 0x1108
+  MEM_USES_SVM_POINTER = 0x1109
   IMAGE_FORMAT = 0x1110
   IMAGE_ELEMENT_SIZE = 0x1111
   IMAGE_ROW_PITCH = 0x1112
@@ -266,6 +301,8 @@ module OpenCL
   IMAGE_BUFFER = 0x1118
   IMAGE_NUM_MIP_LEVELS = 0x1119
   IMAGE_NUM_SAMPLES = 0x111A
+  PIPE_PACKET_SIZE = 0x1120
+  PIPE_MAX_PACKETS = 0x1121
   ADDRESS_NONE = 0x1130
   ADDRESS_CLAMP_TO_EDGE = 0x1131
   ADDRESS_CLAMP = 0x1132
@@ -278,6 +315,9 @@ module OpenCL
   SAMPLER_NORMALIZED_COORDS = 0x1152
   SAMPLER_ADDRESSING_MODE = 0x1153
   SAMPLER_FILTER_MODE = 0x1154
+  SAMPLER_MIP_FILTER_MODE = 0x1155
+  SAMPLER_LOD_MIN = 0x1156
+  SAMPLER_LOD_MAX = 0x1157
   MAP_READ = (1 << 0)
   MAP_WRITE = (1 << 1)
   MAP_WRITE_INVALIDATE_REGION = (1 << 2)
@@ -294,6 +334,7 @@ module OpenCL
   PROGRAM_BUILD_OPTIONS = 0x1182
   PROGRAM_BUILD_LOG = 0x1183
   PROGRAM_BINARY_TYPE = 0x1184
+  PROGRAM_BUILD_GLOBAL_VARIABLE_TOTAL_SIZE = 0x1185
   PROGRAM_BINARY_TYPE_NONE = 0x0
   PROGRAM_BINARY_TYPE_COMPILED_OBJECT = 0x1
   PROGRAM_BINARY_TYPE_LIBRARY = 0x2
@@ -325,12 +366,15 @@ module OpenCL
   KERNEL_ARG_TYPE_CONST = (1 << 0)
   KERNEL_ARG_TYPE_RESTRICT = (1 << 1)
   KERNEL_ARG_TYPE_VOLATILE = (1 << 2)
+  KERNEL_ARG_TYPE_PIPE = (1 << 3)
   KERNEL_WORK_GROUP_SIZE = 0x11B0
   KERNEL_COMPILE_WORK_GROUP_SIZE = 0x11B1
   KERNEL_LOCAL_MEM_SIZE = 0x11B2
   KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE = 0x11B3
   KERNEL_PRIVATE_MEM_SIZE = 0x11B4
   KERNEL_GLOBAL_WORK_SIZE = 0x11B5
+  KERNEL_EXEC_INFO_SVM_PTRS = 0x11B6
+  KERNEL_EXEC_INFO_SVM_FINE_GRAIN_SYSTEM = 0x11B7
   EVENT_COMMAND_QUEUE = 0x11D0
   EVENT_COMMAND_TYPE = 0x11D1
   EVENT_REFERENCE_COUNT = 0x11D2
@@ -361,6 +405,11 @@ module OpenCL
   COMMAND_MIGRATE_MEM_OBJECTS = 0x1206
   COMMAND_FILL_BUFFER = 0x1207
   COMMAND_FILL_IMAGE = 0x1208
+  COMMAND_SVM_FREE = 0x1209
+  COMMAND_SVM_MEMCPY = 0x120A
+  COMMAND_SVM_MEMFILL = 0x120B
+  COMMAND_SVM_MAP = 0x120C
+  COMMAND_SVM_UNMAP = 0x120D
   COMPLETE = 0x0
   RUNNING = 0x1
   SUBMITTED = 0x2
@@ -370,6 +419,7 @@ module OpenCL
   PROFILING_COMMAND_SUBMIT = 0x1281
   PROFILING_COMMAND_START = 0x1282
   PROFILING_COMMAND_END = 0x1283
+  PROFILING_COMMAND_COMPLETE = 0x1284
   GL_OBJECT_BUFFER = 0x2000
   GL_OBJECT_TEXTURE2D = 0x2001
   GL_OBJECT_TEXTURE3D = 0x2002
@@ -400,6 +450,8 @@ module OpenCL
   DEVICE_TERMINATE_CAPABILITY_KHR = 0x200F
   CONTEXT_TERMINATE_KHR = 0x2010
   cl_khr_terminate_context = 1
+  DEVICE_SPIR_VERSIONS = 0x40E0
+  PROGRAM_BINARY_TYPE_INTERMEDIATE = 0x40E1
   DEVICE_COMPUTE_CAPABILITY_MAJOR_NV = 0x4000
   DEVICE_COMPUTE_CAPABILITY_MINOR_NV = 0x4001
   DEVICE_REGISTERS_PER_BLOCK_NV = 0x4002
@@ -407,26 +459,9 @@ module OpenCL
   DEVICE_GPU_OVERLAP_NV = 0x4004
   DEVICE_KERNEL_EXEC_TIMEOUT_NV = 0x4005
   DEVICE_INTEGRATED_MEMORY_NV = 0x4006
-  cl_amd_device_memory_flags = 1
-  MEM_USE_PERSISTENT_MEM_AMD = (1 << 6)        
-  DEVICE_MAX_ATOMIC_COUNTERS_EXT = 0x4032
   DEVICE_PROFILING_TIMER_OFFSET_AMD = 0x4036
-  DEVICE_TOPOLOGY_AMD = 0x4037
-  DEVICE_BOARD_NAME_AMD = 0x4038
-  DEVICE_GLOBAL_FREE_MEMORY_AMD = 0x4039
-  DEVICE_SIMD_PER_COMPUTE_UNIT_AMD = 0x4040
-  DEVICE_SIMD_WIDTH_AMD = 0x4041
-  DEVICE_SIMD_INSTRUCTION_WIDTH_AMD = 0x4042
-  DEVICE_WAVEFRONT_WIDTH_AMD = 0x4043
-  DEVICE_GLOBAL_MEM_CHANNELS_AMD = 0x4044
-  DEVICE_GLOBAL_MEM_CHANNEL_BANKS_AMD = 0x4045
-  DEVICE_GLOBAL_MEM_CHANNEL_BANK_WIDTH_AMD = 0x4046
-  DEVICE_LOCAL_MEM_SIZE_PER_COMPUTE_UNIT_AMD = 0x4047
-  DEVICE_LOCAL_MEM_BANKS_AMD = 0x4048
-  DEVICE_TOPOLOGY_TYPE_PCIE_AMD = 1
-  CONTEXT_OFFLINE_DEVICES_AMD = 0x403F
-  MEM_EXT_HOST_PTR_QCOM = (1 << 29)
-  DEVICE_EXT_MEM_PADDING_IN_BYTES_QCOM = 0x40A0      
+  PRINTF_CALLBACK_ARM = 0x40B0
+  PRINTF_BUFFERSIZE_ARM = 0x40B1
   DEVICE_PAGE_SIZE_QCOM = 0x40A1
   IMAGE_ROW_ALIGNMENT_QCOM = 0x40A2
   IMAGE_SLICE_ALIGNMENT_QCOM = 0x40A3
@@ -444,6 +479,8 @@ module OpenCL
     @@codes[-3] = 'COMPILER_NOT_AVAILABLE'
     @@codes[-2] = 'DEVICE_NOT_AVAILABLE'
     @@codes[-1] = 'DEVICE_NOT_FOUND'
+    @@codes[-70] = 'INVALID_DEVICE_QUEUE'
+    @@codes[-69] = 'INVALID_PIPE_SIZE'
     @@codes[-68] = 'INVALID_DEVICE_PARTITION_COUNT'
     @@codes[-67] = 'INVALID_LINKER_OPTIONS'
     @@codes[-66] = 'INVALID_COMPILER_OPTIONS'
@@ -532,15 +569,18 @@ module OpenCL
   FFI.typedef :cl_uint, :cl_device_mem_cache_type
   FFI.typedef :cl_uint, :cl_device_local_mem_type
   FFI.typedef :cl_bitfield, :cl_device_exec_capabilities
+  FFI.typedef :cl_bitfield, :cl_device_svm_capabilities
   FFI.typedef :cl_bitfield, :cl_command_queue_properties
   FFI.typedef :pointer, :cl_device_partition_property
   FFI.typedef :cl_bitfield, :cl_device_affinity_domain
   FFI.typedef :pointer, :cl_context_properties
   FFI.typedef :cl_uint, :cl_context_info
+  FFI.typedef :cl_bitfield, :cl_queue_properties
   FFI.typedef :cl_uint, :cl_command_queue_info
   FFI.typedef :cl_uint, :cl_channel_order
   FFI.typedef :cl_uint, :cl_channel_type
   FFI.typedef :cl_bitfield, :cl_mem_flags
+  FFI.typedef :cl_bitfield, :cl_svm_mem_flags
   FFI.typedef :cl_uint, :cl_mem_object_type
   FFI.typedef :cl_uint, :cl_mem_info
   FFI.typedef :cl_bitfield, :cl_mem_migration_flags
@@ -550,6 +590,8 @@ module OpenCL
   FFI.typedef :cl_uint, :cl_filter_mode
   FFI.typedef :cl_uint, :cl_sampler_info
   FFI.typedef :cl_bitfield, :cl_map_flags
+  FFI.typedef :pointer, :cl_pipe_properties
+  FFI.typedef :cl_uint, :cl_pipe_info
   FFI.typedef :cl_uint, :cl_program_info
   FFI.typedef :cl_uint, :cl_program_build_info
   FFI.typedef :cl_uint, :cl_program_binary_type
@@ -563,6 +605,8 @@ module OpenCL
   FFI.typedef :cl_uint, :cl_event_info
   FFI.typedef :cl_uint, :cl_command_type
   FFI.typedef :cl_uint, :cl_profiling_info
+  FFI.typedef :cl_bitfield, :cl_sampler_properties
+  FFI.typedef :cl_uint, :cl_kernel_exec_info
   FFI.typedef :cl_uint, :cl_gl_object_type
   FFI.typedef :cl_uint, :cl_gl_texture_info
   FFI.typedef :cl_uint, :cl_gl_platform_info
@@ -606,6 +650,11 @@ module OpenCL
       return @val
     end
 
+    # Returns the integer representing the Enum value
+    def to_int
+      return @val
+    end
+
 #    #:stopdoc:
 #    def self.to_native(value, context)
 #      if value then
@@ -663,19 +712,24 @@ module OpenCL
       return @val
     end
 
+    # Returns the integer representing the Bitfield value
+    def to_int
+      return @val
+    end
+
     # Returns the bitwise & operation between f and the internal Bitfield representation
     def &(f)
-      return @val & f
+      return self.class::new( @val & f )
     end
 
     # Returns the bitwise ^ operation between f and the internal Bitfield representation
     def ^(f)
-      return @val ^ f
+      return self.class::new( @val ^ f )
     end
 
     # Returns the bitwise | operation between f and the internal Bitfield representation
     def |(f)
-      return @val | f
+      return self.class::new( @val | f )
     end
 
     # Returns the internal representation of the Bitfield
@@ -687,7 +741,7 @@ module OpenCL
     def flags=(val)
       @val = val
     end
-    
+
 #    #:stopdoc:
 #    def self.to_native(value, context)
 #      if value then
@@ -793,6 +847,7 @@ module OpenCL
     COMPILER_AVAILABLE = 0x1028
     EXECUTION_CAPABILITIES = 0x1029
     QUEUE_PROPERTIES = 0x102A
+    QUEUE_ON_HOST_PROPERTIES = 0x102A
     NAME = 0x102B
     VENDOR = 0x102C
     PROFILE = 0x102E
@@ -824,6 +879,21 @@ module OpenCL
     PRINTF_BUFFER_SIZE = 0x1049
     IMAGE_PITCH_ALIGNMENT = 0x104A
     IMAGE_BASE_ADDRESS_ALIGNMENT = 0x104B
+    MAX_READ_WRITE_IMAGE_ARGS = 0x104C
+    MAX_GLOBAL_VARIABLE_SIZE = 0x104D
+    QUEUE_ON_DEVICE_PROPERTIES = 0x104E
+    QUEUE_ON_DEVICE_PREFERRED_SIZE = 0x104F
+    QUEUE_ON_DEVICE_MAX_SIZE = 0x1050
+    MAX_ON_DEVICE_QUEUES = 0x1051
+    MAX_ON_DEVICE_EVENTS = 0x1052
+    SVM_CAPABILITIES = 0x1053
+    GLOBAL_VARIABLE_PREFERRED_TOTAL_SIZE = 0x1054
+    MAX_PIPE_ARGS = 0x1055
+    PIPE_MAX_ACTIVE_RESERVATIONS = 0x1056
+    PIPE_MAX_PACKET_SIZE = 0x1057
+    PREFERRED_PLATFORM_ATOMIC_ALIGNMENT = 0x1058
+    PREFERRED_GLOBAL_ATOMIC_ALIGNMENT = 0x1059
+    PREFERRED_LOCAL_ATOMIC_ALIGNMENT = 0x105A
     PARTITION_EQUALLY = 0x1086
     PARTITION_BY_COUNTS = 0x1087
     PARTITION_BY_COUNTS_LIST_END = 0x0
@@ -834,8 +904,13 @@ module OpenCL
     AFFINITY_DOMAIN_L2_CACHE = (1 << 3)
     AFFINITY_DOMAIN_L1_CACHE = (1 << 4)
     AFFINITY_DOMAIN_NEXT_PARTITIONABLE = (1 << 5)
+    SVM_COARSE_GRAIN_BUFFER = (1 << 0)
+    SVM_FINE_GRAIN_BUFFER = (1 << 1)
+    SVM_FINE_GRAIN_SYSTEM = (1 << 2)
+    SVM_ATOMICS = (1 << 3)
     HALF_FP_CONFIG = 0x1033
     TERMINATE_CAPABILITY_KHR = 0x200F
+    SPIR_VERSIONS = 0x40E0
     COMPUTE_CAPABILITY_MAJOR_NV = 0x4000
     COMPUTE_CAPABILITY_MINOR_NV = 0x4001
     REGISTERS_PER_BLOCK_NV = 0x4002
@@ -843,22 +918,7 @@ module OpenCL
     GPU_OVERLAP_NV = 0x4004
     KERNEL_EXEC_TIMEOUT_NV = 0x4005
     INTEGRATED_MEMORY_NV = 0x4006
-    MAX_ATOMIC_COUNTERS_EXT = 0x4032
     PROFILING_TIMER_OFFSET_AMD = 0x4036
-    TOPOLOGY_AMD = 0x4037
-    BOARD_NAME_AMD = 0x4038
-    GLOBAL_FREE_MEMORY_AMD = 0x4039
-    SIMD_PER_COMPUTE_UNIT_AMD = 0x4040
-    SIMD_WIDTH_AMD = 0x4041
-    SIMD_INSTRUCTION_WIDTH_AMD = 0x4042
-    WAVEFRONT_WIDTH_AMD = 0x4043
-    GLOBAL_MEM_CHANNELS_AMD = 0x4044
-    GLOBAL_MEM_CHANNEL_BANKS_AMD = 0x4045
-    GLOBAL_MEM_CHANNEL_BANK_WIDTH_AMD = 0x4046
-    LOCAL_MEM_SIZE_PER_COMPUTE_UNIT_AMD = 0x4047
-    LOCAL_MEM_BANKS_AMD = 0x4048
-    TOPOLOGY_TYPE_PCIE_AMD = 1
-    EXT_MEM_PADDING_IN_BYTES_QCOM = 0x40A0      
     PAGE_SIZE_QCOM = 0x40A1
     #:startdoc:
   
@@ -964,7 +1024,6 @@ module OpenCL
       @@codes[0x1] = 'READ_ONLY_CACHE'
       @@codes[0x2] = 'READ_WRITE_CACHE'
       #:startdoc:
-    
       # Returns a String representing the Enum value name
       def name
         return @@codes[@val]
@@ -979,7 +1038,6 @@ module OpenCL
       @@codes[0x1] = 'LOCAL'
       @@codes[0x2] = 'GLOBAL'
       #:startdoc:
-    
       # Returns a String representing the Enum value name
       def name
         return @@codes[@val]
@@ -1006,6 +1064,24 @@ module OpenCL
       end
     end
 
+    # Bitfield that maps the :cl_device_svm_capabilities
+    class SVMCapabilities < OpenCL::Bitfield
+      #:stopdoc:
+      COARSE_GRAIN_BUFFER = (1 << 0)
+      FINE_GRAIN_BUFFER = (1 << 1)
+      FINE_GRAIN_SYSTEM = (1 << 2)
+      ATOMICS = (1 << 3)
+      #:startdoc:
+      # Returns an Array of String representing the different flags set
+      def names
+        fs = []
+        %w( COARSE_GRAIN_BUFFER FINE_GRAIN_BUFFER FINE_GRAIN_SYSTEM ATOMICS ).each { |f|
+          fs.push(f) if self.include?( self.class.const_get(f) )
+        }
+        return fs
+      end
+    end
+
   end
   class Context < FFI::ManagedStruct
     layout :dummy, :pointer
@@ -1018,7 +1094,6 @@ module OpenCL
     INTEROP_USER_SYNC = 0x1085
     MEMORY_INITIALIZE_KHR = 0x200E
     TERMINATE_KHR = 0x2010
-    OFFLINE_DEVICES_AMD = 0x403F
     #:startdoc:
   
     # Creates a new Context and retains it if specified and aplicable
@@ -1053,10 +1128,13 @@ module OpenCL
     #:stopdoc:
     OUT_OF_ORDER_EXEC_MODE_ENABLE = (1 << 0)
     PROFILING_ENABLE = (1 << 1)
+    ON_DEVICE = (1 << 2)
+    ON_DEVICE_DEFAULT = (1 << 3)
     CONTEXT = 0x1090
     DEVICE = 0x1091
     REFERENCE_COUNT = 0x1092
     PROPERTIES = 0x1093
+    SIZE = 0x1094
     #:startdoc:
   
     # Creates a new CommandQueue and retains it if specified and aplicable
@@ -1091,11 +1169,13 @@ module OpenCL
       #:stopdoc:
       OUT_OF_ORDER_EXEC_MODE_ENABLE = (1 << 0)
       PROFILING_ENABLE = (1 << 1)
+      ON_DEVICE = (1 << 2)
+      ON_DEVICE_DEFAULT = (1 << 3)
       #:startdoc:
       # Returns an Array of String representing the different flags set
       def names
         fs = []
-        %w( OUT_OF_ORDER_EXEC_MODE_ENABLE PROFILING_ENABLE ).each { |f|
+        %w( OUT_OF_ORDER_EXEC_MODE_ENABLE PROFILING_ENABLE ON_DEVICE ON_DEVICE_DEFAULT ).each { |f|
           fs.push(f) if self.include?( self.class.const_get(f) )
         }
         return fs
@@ -1115,6 +1195,8 @@ module OpenCL
     HOST_WRITE_ONLY = (1 << 7)
     HOST_READ_ONLY = (1 << 8)
     HOST_NO_ACCESS = (1 << 9)
+    SVM_FINE_GRAIN_BUFFER = (1 << 10)
+    SVM_ATOMICS = (1 << 11)
     BUFFER = 0x10F0
     IMAGE2D = 0x10F1
     IMAGE3D = 0x10F2
@@ -1122,6 +1204,7 @@ module OpenCL
     IMAGE1D = 0x10F4
     IMAGE1D_ARRAY = 0x10F5
     IMAGE1D_BUFFER = 0x10F6
+    PIPE = 0x10F7
     TYPE = 0x1100
     FLAGS = 0x1101
     SIZE = 0x1102
@@ -1131,8 +1214,7 @@ module OpenCL
     CONTEXT = 0x1106
     ASSOCIATED_MEMOBJECT = 0x1107
     OFFSET = 0x1108
-    USE_PERSISTENT_MEM_AMD = (1 << 6)        
-    EXT_HOST_PTR_QCOM = (1 << 29)
+    USES_SVM_POINTER = 0x1109
     HOST_UNCACHED_QCOM = 0x40A4
     HOST_WRITEBACK_QCOM = 0x40A5
     HOST_WRITETHROUGH_QCOM = 0x40A6
@@ -1217,6 +1299,7 @@ module OpenCL
       IMAGE1D = 0x10F4
       IMAGE1D_ARRAY = 0x10F5
       IMAGE1D_BUFFER = 0x10F6
+      PIPE = 0x10F7
       @@codes[0x10F0] = 'BUFFER'
       @@codes[0x10F1] = 'IMAGE2D'
       @@codes[0x10F2] = 'IMAGE3D'
@@ -1224,14 +1307,33 @@ module OpenCL
       @@codes[0x10F4] = 'IMAGE1D'
       @@codes[0x10F5] = 'IMAGE1D_ARRAY'
       @@codes[0x10F6] = 'IMAGE1D_BUFFER'
+      @@codes[0x10F7] = 'PIPE'
       #:startdoc:
-    
       # Returns a String representing the Enum value name
       def name
         return @@codes[@val]
       end
     end
 
+    # Bitfield that maps the :cl_svm_mem_flags type
+    class SVMFlags < OpenCL::Bitfield
+      #:stopdoc:
+      READ_WRITE = (1 << 0)
+      WRITE_ONLY = (1 << 1)
+      READ_ONLY = (1 << 2)
+      SVM_FINE_GRAIN_BUFFER = (1 << 10)
+      SVM_ATOMICS = (1 << 11)
+      #:startdoc:
+      # Returns an Array of String representing the different flags set
+      def names
+        fs = []
+        %w( READ_WRITE WRITE_ONLY READ_ONLY SVM_FINE_GRAIN_BUFFER SVM_ATOMICS ).each { |f|
+          fs.push(f) if self.include?( self.class.const_get(f) )
+        }
+        return fs
+      end
+    end
+
   end
   class Program < FFI::ManagedStruct
     layout :dummy, :pointer
@@ -1249,10 +1351,12 @@ module OpenCL
     BUILD_OPTIONS = 0x1182
     BUILD_LOG = 0x1183
     BINARY_TYPE = 0x1184
+    BUILD_GLOBAL_VARIABLE_TOTAL_SIZE = 0x1185
     BINARY_TYPE_NONE = 0x0
     BINARY_TYPE_COMPILED_OBJECT = 0x1
     BINARY_TYPE_LIBRARY = 0x2
     BINARY_TYPE_EXECUTABLE = 0x4
+    BINARY_TYPE_INTERMEDIATE = 0x40E1
     #:startdoc:
   
     # Creates a new Program and retains it if specified and aplicable
@@ -1290,12 +1394,13 @@ module OpenCL
       COMPILED_OBJECT = 0x1
       LIBRARY = 0x2
       EXECUTABLE = 0x4
+      INTERMEDIATE = 0x40E1
       @@codes[0x0] = 'NONE'
       @@codes[0x1] = 'COMPILED_OBJECT'
       @@codes[0x2] = 'LIBRARY'
       @@codes[0x4] = 'EXECUTABLE'
+      @@codes[0x40E1] = 'INTERMEDIATE'
       #:startdoc:
-    
       # Returns a String representing the Enum value name
       def name
         return @@codes[@val]
@@ -1329,12 +1434,15 @@ module OpenCL
     ARG_TYPE_CONST = (1 << 0)
     ARG_TYPE_RESTRICT = (1 << 1)
     ARG_TYPE_VOLATILE = (1 << 2)
+    ARG_TYPE_PIPE = (1 << 3)
     WORK_GROUP_SIZE = 0x11B0
     COMPILE_WORK_GROUP_SIZE = 0x11B1
     LOCAL_MEM_SIZE = 0x11B2
     PREFERRED_WORK_GROUP_SIZE_MULTIPLE = 0x11B3
     PRIVATE_MEM_SIZE = 0x11B4
     GLOBAL_WORK_SIZE = 0x11B5
+    EXEC_INFO_SVM_PTRS = 0x11B6
+    EXEC_INFO_SVM_FINE_GRAIN_SYSTEM = 0x11B7
     #:startdoc:
   
     # Creates a new Kernel and retains it if specified and aplicable
@@ -1385,6 +1493,7 @@ module OpenCL
       TYPE_CONST = (1 << 0)
       TYPE_RESTRICT = (1 << 1)
       TYPE_VOLATILE = (1 << 2)
+      TYPE_PIPE = (1 << 3)
       #:startdoc:
     end
 
@@ -1401,7 +1510,6 @@ module OpenCL
         @@codes[0x119D] = 'CONSTANT'
         @@codes[0x119E] = 'PRIVATE'
         #:startdoc:
-      
         # Returns a String representing the Enum value name
         def name
           return @@codes[@val]
@@ -1420,7 +1528,6 @@ module OpenCL
         @@codes[0x11A2] = 'READ_WRITE'
         @@codes[0x11A3] = 'NONE'
         #:startdoc:
-      
         # Returns a String representing the Enum value name
         def name
           return @@codes[@val]
@@ -1434,11 +1541,12 @@ module OpenCL
         CONST = (1 << 0)
         RESTRICT = (1 << 1)
         VOLATILE = (1 << 2)
+        PIPE = (1 << 3)
         #:startdoc:
         # Returns an Array of String representing the different flags set
         def names
           fs = []
-          %w( NONE CONST RESTRICT VOLATILE ).each { |f|
+          %w( NONE CONST RESTRICT VOLATILE PIPE ).each { |f|
             fs.push(f) if self.include?( self.class.const_get(f) )
           }
           return fs
@@ -1492,6 +1600,9 @@ module OpenCL
     NORMALIZED_COORDS = 0x1152
     ADDRESSING_MODE = 0x1153
     FILTER_MODE = 0x1154
+    MIP_FILTER_MODE = 0x1155
+    LOD_MIN = 0x1156
+    LOD_MAX = 0x1157
     #:startdoc:
   
     # Creates a new Sampler and retains it if specified and aplicable
@@ -1521,6 +1632,30 @@ module OpenCL
     end
   end
 
+  class Sampler
+    # Enum that maps the :cl_sampler_properties
+    class Type < OpenCL::Enum
+      #:stopdoc:
+      NORMALIZED_COORDS = 0x1152
+      ADDRESSING_MODE = 0x1153
+      FILTER_MODE = 0x1154
+      MIP_FILTER_MODE = 0x1155
+      LOD_MIN = 0x1156
+      LOD_MAX = 0x1157
+      @@codes[0x1152] = 'NORMALIZED_COORDS'
+      @@codes[0x1153] = 'ADDRESSING_MODE'
+      @@codes[0x1154] = 'FILTER_MODE'
+      @@codes[0x1155] = 'MIP_FILTER_MODE'
+      @@codes[0x1156] = 'LOD_MIN'
+      @@codes[0x1157] = 'LOD_MAX'
+      #:startdoc:
+      # Returns a String representing the Enum value name
+      def name
+        return @@codes[@val]
+      end
+    end
+
+  end
   class GLsync < FFI::ManagedStruct
     layout :dummy, :pointer
     #:stopdoc:
@@ -1564,6 +1699,11 @@ module OpenCL
     RGBx = 0x10BC
     DEPTH = 0x10BD
     DEPTH_STENCIL = 0x10BE
+    sRGB = 0x10BF
+    sRGBx = 0x10C0
+    sRGBA = 0x10C1
+    sBGRA = 0x10C2
+    ABGR = 0x10C3
     @@codes[0x10B0] = 'R'
     @@codes[0x10B1] = 'A'
     @@codes[0x10B2] = 'RG'
@@ -1579,8 +1719,12 @@ module OpenCL
     @@codes[0x10BC] = 'RGBx'
     @@codes[0x10BD] = 'DEPTH'
     @@codes[0x10BE] = 'DEPTH_STENCIL'
+    @@codes[0x10BF] = 'sRGB'
+    @@codes[0x10C0] = 'sRGBx'
+    @@codes[0x10C1] = 'sRGBA'
+    @@codes[0x10C2] = 'sBGRA'
+    @@codes[0x10C3] = 'ABGR'
     #:startdoc:
-  
     # Returns a String representing the Enum value name
     def name
       return @@codes[@val]
@@ -1623,7 +1767,6 @@ module OpenCL
     @@codes[0x10DE] = 'FLOAT'
     @@codes[0x10DF] = 'UNORM_INT24'
     #:startdoc:
-  
     # Returns a String representing the Enum value name
     def name
       return @@codes[@val]
@@ -1644,7 +1787,6 @@ module OpenCL
     @@codes[0x1133] = 'REPEAT'
     @@codes[0x1134] = 'MIRRORED_REPEAT'
     #:startdoc:
-  
     # Returns a String representing the Enum value name
     def name
       return @@codes[@val]
@@ -1659,7 +1801,6 @@ module OpenCL
     @@codes[0x1140] = 'NEAREST'
     @@codes[0x1141] = 'LINEAR'
     #:startdoc:
-  
     # Returns a String representing the Enum value name
     def name
       return @@codes[@val]
@@ -1711,6 +1852,11 @@ module OpenCL
     MIGRATE_MEM_OBJECTS = 0x1206
     FILL_BUFFER = 0x1207
     FILL_IMAGE = 0x1208
+    SVM_FREE = 0x1209
+    SVM_MEMCPY = 0x120A
+    SVM_MEMFILL = 0x120B
+    SVM_MAP = 0x120C
+    SVM_UNMAP = 0x120D
     @@codes[0x11F0] = 'NDRANGE_KERNEL'
     @@codes[0x11F1] = 'TASK'
     @@codes[0x11F2] = 'NATIVE_KERNEL'
@@ -1736,8 +1882,12 @@ module OpenCL
     @@codes[0x1206] = 'MIGRATE_MEM_OBJECTS'
     @@codes[0x1207] = 'FILL_BUFFER'
     @@codes[0x1208] = 'FILL_IMAGE'
+    @@codes[0x1209] = 'SVM_FREE'
+    @@codes[0x120A] = 'SVM_MEMCPY'
+    @@codes[0x120B] = 'SVM_MEMFILL'
+    @@codes[0x120C] = 'SVM_MAP'
+    @@codes[0x120D] = 'SVM_UNMAP'
     #:startdoc:
-  
     # Returns a String representing the Enum value name
     def name
       return @@codes[@val]
@@ -1764,7 +1914,6 @@ module OpenCL
     @@codes[0x2010] = 'TEXTURE1D_ARRAY'
     @@codes[0x2011] = 'TEXTURE_BUFFER'
     #:startdoc:
-  
     # Returns a String representing the Enum value name
     def name
       return @@codes[@val]
@@ -1783,7 +1932,6 @@ module OpenCL
     @@codes[-2] = 'ERROR'
     @@codes[-3] = 'IN_PROGRESS'
     #:startdoc:
-  
     # Returns a String representing the Enum value name
     def name
       return @@codes[@val]
@@ -1802,7 +1950,6 @@ module OpenCL
     @@codes[0x2] = 'SUBMITTED'
     @@codes[0x3] = 'QUEUED'
     #:startdoc:
-  
     # Returns a String representing the Enum value name
     def name
       return @@codes[@val]
@@ -1829,6 +1976,13 @@ module OpenCL
     SLICE_ALIGNMENT_QCOM = 0x40A3
     #:startdoc:
   end
+  class Pipe < Mem
+    layout :dummy, :pointer
+    #:stopdoc:
+    PACKET_SIZE = 0x1120
+    MAX_PACKETS = 0x1121
+    #:startdoc:
+  end
   attach_function :clGetPlatformIDs, [:cl_uint,:pointer,:pointer], :cl_int
   attach_function :clGetPlatformInfo, [Platform,:cl_platform_info,:size_t,:pointer,:pointer], :cl_int
   attach_function :clGetDeviceIDs, [Platform,:cl_device_type,:cl_uint,:pointer,:pointer], :cl_int
@@ -1840,7 +1994,6 @@ module OpenCL
   attach_function :clRetainContext, [Context], :cl_int
   attach_function :clReleaseContext, [Context], :cl_int
   attach_function :clGetContextInfo, [Context,:cl_context_info,:size_t,:pointer,:pointer], :cl_int
-  attach_function :clCreateCommandQueue, [Context,Device,:cl_command_queue_properties,:pointer], CommandQueue
   attach_function :clRetainCommandQueue, [CommandQueue], :cl_int
   attach_function :clReleaseCommandQueue, [CommandQueue], :cl_int
   attach_function :clGetCommandQueueInfo, [CommandQueue,:cl_command_queue_info,:size_t,:pointer,:pointer], :cl_int
@@ -1853,7 +2006,6 @@ module OpenCL
   attach_function :clGetImageInfo, [Mem,:cl_image_info,:size_t,:pointer,:pointer], :cl_int
   callback :clSetMemObjectDestructorCallback_notify, [Mem.by_ref,:pointer], :void
   attach_function :clSetMemObjectDestructorCallback, [Mem,:clSetMemObjectDestructorCallback_notify,:pointer], :cl_int
-  attach_function :clCreateSampler, [Context,:cl_bool,:cl_addressing_mode,:cl_filter_mode,:pointer], Sampler
   attach_function :clRetainSampler, [Sampler], :cl_int
   attach_function :clReleaseSampler, [Sampler], :cl_int
   attach_function :clGetSamplerInfo, [Sampler,:cl_sampler_info,:size_t,:pointer,:pointer], :cl_int
@@ -1898,7 +2050,6 @@ module OpenCL
   attach_function :clEnqueueMapImage, [CommandQueue,Mem,:cl_bool,:cl_map_flags,:pointer,:pointer,:pointer,:pointer,:cl_uint,:pointer,:pointer,:pointer], :pointer
   attach_function :clEnqueueUnmapMemObject, [CommandQueue,Mem,:pointer,:cl_uint,:pointer,:pointer], :cl_int
   attach_function :clEnqueueNDRangeKernel, [CommandQueue,Kernel,:cl_uint,:pointer,:pointer,:pointer,:cl_uint,:pointer,:pointer], :cl_int
-  attach_function :clEnqueueTask, [CommandQueue,Kernel,:cl_uint,:pointer,:pointer], :cl_int
   callback :clEnqueueNativeKernel_notify, [:pointer], :void
   attach_function :clEnqueueNativeKernel, [CommandQueue,:clEnqueueNativeKernel_notify,:pointer,:size_t,:cl_uint,:pointer,:pointer,:cl_uint,:pointer,:pointer], :cl_int
   attach_function :clCreateImage2D, [Context,:cl_mem_flags,:pointer,:size_t,:size_t,:size_t,:pointer,:pointer], Mem
@@ -1908,6 +2059,9 @@ module OpenCL
   attach_function :clEnqueueBarrier, [CommandQueue], :cl_int
   attach_function :clUnloadCompiler, [:void], :cl_int
   attach_function :clGetExtensionFunctionAddress, [:pointer], :pointer
+  attach_function :clCreateCommandQueue, [Context,Device,:cl_command_queue_properties,:pointer], CommandQueue
+  attach_function :clCreateSampler, [Context,:cl_bool,:cl_addressing_mode,:cl_filter_mode,:pointer], Sampler
+  attach_function :clEnqueueTask, [CommandQueue,Kernel,:cl_uint,:pointer,:pointer], :cl_int
   attach_function :clCreateFromGLBuffer, [Context,:cl_mem_flags,:cl_GLuint,:pointer], Mem
   attach_function :clCreateFromGLRenderbuffer, [Context,:cl_mem_flags,:cl_GLuint,:pointer], Mem
   attach_function :clGetGLObjectInfo, [Mem,:pointer,:pointer], :cl_int
@@ -1935,6 +2089,24 @@ module OpenCL
     attach_function :clEnqueueBarrierWithWaitList, [CommandQueue,:cl_uint,:pointer,:pointer], :cl_int
     attach_function :clGetExtensionFunctionAddressForPlatform, [Platform,:pointer], :pointer
     attach_function :clCreateFromGLTexture, [Context,:cl_mem_flags,:cl_GLenum,:cl_GLint,:cl_GLuint,:pointer], Mem
+    begin
+      attach_function :clCreateCommandQueueWithProperties, [Context,Device,:pointer,:pointer], CommandQueue
+      attach_function :clCreatePipe, [Context,:cl_mem_flags,:cl_uint,:cl_uint,:pointer,:pointer], Mem
+      attach_function :clGetPipeInfo, [Mem,:cl_pipe_info,:size_t,:pointer,:pointer], :cl_int
+      attach_function :clSVMAlloc, [Context,:cl_svm_mem_flags,:size_t,:cl_uint], :pointer
+      attach_function :clSVMFree, [Context,:pointer], :void
+      attach_function :clCreateSamplerWithProperties, [Context,:pointer,:pointer], Sampler
+      attach_function :clSetKernelArgSVMPointer, [Kernel,:cl_uint,:pointer], :cl_int
+      attach_function :clSetKernelExecInfo, [Kernel,:cl_kernel_exec_info,:size_t,:pointer], :cl_int
+      callback :clEnqueueSVMFree_notify, [CommandQueue.by_ref,:cl_uint,:pointer,:pointer], :void
+      attach_function :clEnqueueSVMFree, [CommandQueue,:cl_uint,:pointer,:clEnqueueSVMFree_notify,:pointer,:cl_uint,:pointer,:pointer], :cl_int
+      attach_function :clEnqueueSVMMemcpy, [CommandQueue,:cl_bool,:pointer,:pointer,:size_t,:cl_uint,:pointer,:pointer], :cl_int
+      attach_function :clEnqueueSVMMemFill, [CommandQueue,:pointer,:pointer,:size_t,:size_t,:cl_uint,:pointer,:pointer], :cl_int
+      attach_function :clEnqueueSVMMap, [CommandQueue,:cl_bool,:cl_map_flags,:pointer,:size_t,:cl_uint,:pointer,:pointer], :cl_int
+      attach_function :clEnqueueSVMUnmap, [CommandQueue,:pointer,:cl_uint,:pointer,:pointer], :cl_int
+    rescue FFI::NotFoundError => e
+      STDERR.puts "Warning OpenCL 1.2 loader detected!"
+    end
   rescue FFI::NotFoundError => e
     STDERR.puts "Warning OpenCL 1.1 loader detected!"
   end