opencl_ruby_ffi 1.0.9 → 1.1.0

data/lib/opencl_ruby_ffi/CommandQueue.rb

@@ -1055,6 +1055,11 @@ module OpenCL
       include InnerGenerator
     end
 
+    def inspect
+      p = properties
+      return "#<#{self.class.name}: -> #{device.inspect}#{ 0 != p.to_i ? " (#{p})" : ""}>"
+    end
+
     # Returns the Context associated to the CommandQueue
     def context
       ptr = FFI::MemoryPointer::new( Context )
@@ -1094,6 +1099,16 @@ module OpenCL
     # 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")
+
     # Enqueues a kernel as a task using the CommandQueue
     #
     # ==== Attributes

data/lib/opencl_ruby_ffi/Context.rb

@@ -62,6 +62,10 @@ module OpenCL
       include InnerGenerator
     end
 
+    def inspect
+      return "#<#{self.class.name}: #{self.devices}>"
+    end
+
     ##
     # :method: reference_count
     # Returns the reference count of the Context
@@ -72,7 +76,31 @@ module OpenCL
     ##
     # :method: properties
     # the Array of :cl_context_properties used to create the Context
-    eval get_info_array("Context", :cl_context_properties, "PROPERTIES")
+    def properties
+      ptr1 = FFI::MemoryPointer::new( :size_t, 1)
+      error = OpenCL.clGetContextInfo(self, PROPERTIES, 0, nil, ptr1)
+      error_check(error)
+      return [] if ptr1.read_size_t == 0
+      ptr2 = FFI::MemoryPointer::new( ptr1.read_size_t )
+      error = OpenCL.clGetContextInfo(self, PROPERTIES, ptr1.read_size_t, ptr2, nil)
+      error_check(error)
+      arr = ptr2.get_array_of_cl_context_properties(0, ptr1.read_size_t/ FFI.find_type(:cl_context_properties).size)
+      return arr if arr.length == 1 and arr[0].to_i == 0
+      arr_2 = []
+      while arr.length > 2 do
+        prop = arr.shift.to_i
+        arr_2.push Properties::new(prop)
+        return arr_2 if arr.length <= 0
+        if prop == Properties::PLATFORM then
+          arr_2.push Platform::new(arr.shift)
+        else
+          arr_2.push arr.shift.to_i
+        end
+        return arr_2 if arr.length <= 0
+      end
+      arr_2.push arr.shift.to_i if arr.length > 0
+      return arr_2
+    end
 
     # Returns the platform associated to the Context
     def platform
@@ -117,6 +145,7 @@ module OpenCL
     # * +:flags+ - a single or an Array of :cl_mem_flags specifying the flags to be used when creating the Buffer
     def supported_image_formats( image_type, options = {} )
       flags = get_flags( options )
+      flags = Mem::Flags::READ_WRITE if flags.to_i == 0 #ensure default READ_WRITE, Intel bug.
       num_image_formats = FFI::MemoryPointer::new( :cl_uint )
       error = OpenCL.clGetSupportedImageFormats( self, flags, image_type, 0, nil, num_image_formats )
       error_check(error)

data/lib/opencl_ruby_ffi/Device.rb

@@ -54,6 +54,10 @@ module OpenCL
       include InnerGenerator
     end
 
+    def inspect
+      return "#<#{self.class.name}: #{name} (#{pointer.to_i})>"
+    end
+
     #:stopdoc:
     DRIVER_VERSION = 0x102D
     #:startdoc:
@@ -189,7 +193,17 @@ module OpenCL
     ##
     # :method: partition_properties()
     # Returns the list of partition types supported by the Device
-    eval get_info_array("Device", :cl_device_partition_property, "PARTITION_PROPERTIES")
+    def partition_properties
+      ptr1 = FFI::MemoryPointer::new( :size_t, 1)
+      error = OpenCL.clGetDeviceInfo(self, PARTITION_PROPERTIES, 0, nil, ptr1)
+      error_check(error)
+      ptr2 = FFI::MemoryPointer::new( ptr1.read_size_t )
+      error = OpenCL.clGetDeviceInfo(self, PARTITION_PROPERTIES, ptr1.read_size_t, ptr2, nil)
+      error_check(error)
+      arr = ptr2.get_array_of_cl_device_partition_property(0, ptr1.read_size_t/ FFI.find_type(:cl_device_partition_property).size)
+      arr.reject! { |e| e.null? }
+      return arr.collect { |e| Partition::new(e.to_i) }
+    end
 
     ##
     # :method: svm_capabilities()
@@ -198,17 +212,38 @@ module OpenCL
 
     # Return an Array of partition properties names representing the partition type supported by the device
     def partition_properties_names
-      prop_names = []
-      props = self.partition_properties
-      %w( PARTITION_EQUALLY PARTITION_BY_COUNTS PARTITION_BY_AFFINITY_DOMAIN ).each { |prop|
-        prop_names.push(prop) if props.include?(Device.const_get(prop))
-      }
+      self.partition_properties.collect { |p| p.name }
     end
 
     ##
     # :method: partition_type()
     # Returns a list of :cl_device_partition_property used to create the Device
-    eval get_info_array("Device", :cl_device_partition_property, "PARTITION_TYPE")
+    def partition_type
+      ptr1 = FFI::MemoryPointer::new( :size_t, 1)
+      error = OpenCL.clGetDeviceInfo(self, PARTITION_TYPE, 0, nil, ptr1)
+      error_check(error)
+      ptr2 = FFI::MemoryPointer::new( ptr1.read_size_t )
+      error = OpenCL.clGetDeviceInfo(self, PARTITION_TYPE, ptr1.read_size_t, ptr2, nil)
+      error_check(error)
+      arr = ptr2.get_array_of_cl_device_partition_property(0, ptr1.read_size_t/ FFI.find_type(:cl_device_partition_property).size)
+      if arr.first.to_i == Partition::BY_NAMES_EXT then
+        arr_2 = []
+        arr_2.push(Partition::new(arr.first.to_i))
+        i = 1
+        return arr_2 if arr.length <= i
+        while arr[i].to_i - (0x1 << FFI::Pointer.size * 8) != Partition::BY_NAMES_LIST_END_EXT do
+          arr_2[i] = arr[i].to_i
+          i += 1
+          return arr_2 if arr.length <= i
+        end
+        arr_2[i] = Partition::new(Partition::BY_NAMES_LIST_END_EXT)
+        arr_2[i+1] = 0
+        return arr_2
+      else
+        return arr.collect { |e| Partition::new(e.to_i) }
+      end
+    end
+    #eval get_info_array("Device", :cl_device_partition_property, "PARTITION_TYPE")
 
     # Returns the Platform the Device belongs to
     def platform

data/lib/opencl_ruby_ffi/Event.rb

@@ -73,6 +73,10 @@ module OpenCL
       include InnerGenerator
     end
 
+    def inspect
+      return "#<#{self.class.name}: #{command_type}>"
+    end
+
     # Returns the CommandQueue associated with the Event, if it exists
     def command_queue
       ptr = FFI::MemoryPointer::new( CommandQueue )

data/lib/opencl_ruby_ffi/Image.rb

@@ -120,7 +120,7 @@ module OpenCL
   #
   # ==== Options
   #
-  # * +:flags+ - a single or an Array of :cl_mem_flags specifying the flags to be used when creating the Image (default Mem::READ_WRITE)
+  # * +:flags+ - a single or an Array of :cl_mem_flags specifying the flags to be used when creating the Image
   def self.create_from_gl_render_buffer( context, renderbuffer, options = {} )
     flags = get_flags( options )
     error = FFI::MemoryPointer::new( :cl_int )
@@ -144,7 +144,7 @@ module OpenCL
   # ==== Options
   #
   # * +:miplevel+ - a :GLint specifying the mipmap level to be used (default 0)
-  # * +:flags+ - a single or an Array of :cl_mem_flags specifying the flags to be used when creating the Image (default Mem::READ_WRITE)
+  # * +:flags+ - a single or an Array of :cl_mem_flags specifying the flags to be used when creating the Image
   def self.create_from_gl_texture( context, texture_target, texture, options = {} )
     if context.platform.version_number < 1.2 then
       error_check(INVALID_OPERATION)
@@ -220,6 +220,13 @@ module OpenCL
   # Maps the cl_mem OpenCL objects of type CL_MEM_OBJECT_IMAGE*
   class Image #< Mem
 
+    def inspect
+      h = height
+      d = depth
+      f = flags
+      return "#<#{self.class.name}: #{format.channel_order}, #{format.channel_data_type}, #{width}#{h != 0 ? "x#{h}" : ""}#{d != 0 ? "x#{d}" : ""} (#{size})#{f.to_i != 0 ? " (#{f})" : "" }>"
+    end
+
     ##
     # :method: element_size
     # Returns the element_size of the Image

data/lib/opencl_ruby_ffi/Kernel.rb

@@ -51,6 +51,10 @@ module OpenCL
       include InnerGenerator
     end
 
+    def inspect
+      return "#<#{self.class.name}: #{name}>"
+    end
+
     # Maps the logical cl arg object
     class Arg
       include InnerInterface

data/lib/opencl_ruby_ffi/Mem.rb

@@ -26,6 +26,11 @@ module OpenCL
       include InnerGenerator
     end
 
+    def inspect
+      f = flags
+      return "#<#{self.class.name}: #{size}#{ 0 != f.to_i ? " (#{f})" : ""}>"
+    end
+
     # Returns the Context associated to the Mem
     def context
       ptr = FFI::MemoryPointer::new( Context )

data/lib/opencl_ruby_ffi/Pipe.rb

@@ -27,7 +27,12 @@ module OpenCL
     class << self
       include InnerGenerator
     end
-    
+
+    def inspect
+      f = flags
+      return "#<#{self.class.inspect}: #{packet_size}x#{max_packets}#{ 0 != f.to_i ? " (#{f})" : ""}>"
+    end
+
     ##
     # :method: packet_size
     # Returns the packet_size of the Pipe

data/lib/opencl_ruby_ffi/Platform.rb

@@ -77,6 +77,10 @@ module OpenCL
       include InnerGenerator
     end
 
+    def inspect
+      return "#<#{self.class.name}: #{self.name}>"
+    end
+
     ##
     # :method: icd_suffix_khr()
     # Returns a String containing the function name suffix used to identify extension functions to be directed to this platform by the ICD Loader

data/lib/opencl_ruby_ffi/Program.rb

@@ -210,6 +210,15 @@ module OpenCL
     class << self
       include InnerGenerator
     end
+
+    def inspect
+      success = false
+      build_status.each { |d,s|
+        success |= true if s.to_i == BuildStatus::SUCCESS
+      }
+      return "#<#{self.class.name}: #{success ? kernel_names : ""}>"
+    end
+
     alias_method :orig_method_missing, :method_missing
 
     # Intercepts a call to a missing method and tries to see if it is defined as a Kernel inside
@@ -237,14 +246,18 @@ module OpenCL
 
     # Returns an Array of String representing the Kernel names inside the Program
     def kernel_names
-      kernel_names_size = FFI::MemoryPointer::new( :size_t )
-      error = OpenCL.clGetProgramInfo( self, KERNEL_NAMES, 0, nil, kernel_names_size)
-      error_check(error)
-      k_names = FFI::MemoryPointer::new( kernel_names_size.read_size_t )
-      error = OpenCL.clGetProgramInfo( self, KERNEL_NAMES, kernel_names_size.read_size_t, k_names, nil)
-      error_check(error)
-      k_names_string = k_names.read_string
-      return k_names_string.split(";")
+      if context.platform.version_number < 1.2 then
+        return kernels.collect(&:name)
+      else
+        kernel_names_size = FFI::MemoryPointer::new( :size_t )
+        error = OpenCL.clGetProgramInfo( self, KERNEL_NAMES, 0, nil, kernel_names_size)
+        error_check(error)
+        k_names = FFI::MemoryPointer::new( kernel_names_size.read_size_t )
+        error = OpenCL.clGetProgramInfo( self, KERNEL_NAMES, kernel_names_size.read_size_t, k_names, nil)
+        error_check(error)
+        k_names_string = k_names.read_string
+        return k_names_string.split(";")
+      end
     end
 
     # Returns the concatenated Program sources

data/lib/opencl_ruby_ffi/SVM.rb

@@ -15,6 +15,10 @@ module OpenCL
       @size = size
     end
 
+    def inspect
+      return "#<#{self.class.name}: #{@size}>"
+    end
+
     # creates a new SVMPointer relative to an existing one from an offset
     def +( offset )
       return SVMPointer::new(  self.address + offset, @context, @size, @base )

data/lib/opencl_ruby_ffi/Sampler.rb

@@ -29,30 +29,30 @@ module OpenCL
       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( Sampler::NORMALIZED_COORDS )
-      properties[1].write_cl_sampler_properties( normalized_coords )
-      properties[2].write_cl_sampler_properties( Sampler::ADDRESSING_MODE )
-      properties[3].write_cl_sampler_properties( addressing_mode )
-      properties[4].write_cl_sampler_properties( Sampler::FILTER_MODE )
-      properties[5].write_cl_sampler_properties( filter_mode )
+      properties = FFI::MemoryPointer::new( :cl_sampler_info )
+      properties[0].write_cl_sampler_info( Sampler::NORMALIZED_COORDS )
+      properties[1].write_cl_bool( normalized_coords )
+      properties[2].write_cl_sampler_info( Sampler::ADDRESSING_MODE )
+      properties[3].write_cl_addressing_mode( addressing_mode )
+      properties[4].write_cl_sampler_info( Sampler::FILTER_MODE )
+      properties[5].write_cl_filter_mode( filter_mode )
       prop_indx = 6
       if options[:mip_filter_mode] then
-        properties[prop_indx].write_cl_sampler_properties( Sampler::MIP_FILTER_MODE )
-        properties[prop_indx+1].write_cl_sampler_properties( options[:mip_filter_mode] )
+        properties[prop_indx].write_cl_sampler_info( Sampler::MIP_FILTER_MODE )
+        properties[prop_indx+1].write_cl_filter_mode( options[:mip_filter_mode] )
         prop_indx += 2
       end
       if options[:lod_min] then
-        properties[prop_indx].write_cl_sampler_properties( Sampler::LOD_MIN )
+        properties[prop_indx].write_cl_sampler_info( 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( Sampler::LOD_MAX )
+        properties[prop_indx].write_cl_sampler_info( Sampler::LOD_MAX )
         properties[prop_indx+1].write_float( options[:lod_max] )
         prop_indx += 2
       end
-      properties[prop_indx].write_cl_sampler_properties( 0 )
+      properties[prop_indx].write_cl_sampler_info( 0 )
       sampler_ptr = clCreateSamplerWithProperties( context, properties, error )
     end
     error_check(error.read_cl_int)
@@ -67,6 +67,10 @@ module OpenCL
       include InnerGenerator
     end
 
+    def inspect
+      return "#<#{self.class.name}: #{addressing_mode} #{filter_mode} normalized: #{normalized_coords}>"
+    end
+
     # Returns the context associated with the Sampler
     def context
       ptr = FFI::MemoryPointer::new( Context )

data/lib/opencl_ruby_ffi/opencl_ruby_ffi_base.rb

@@ -51,6 +51,10 @@ module OpenCL
     layout :image_channel_order, :cl_channel_order,
            :image_channel_data_type, :cl_channel_type
 
+    def inspect
+      return "#<#{self.class.name}: #{channel_order} #{channel_data_type}>"
+    end
+
     # Creates a new ImageFormat from an image channel order and data type
     def initialize( image_channel_order, image_channel_data_type )
       super()
@@ -220,7 +224,7 @@ module OpenCL
       if options[:properties] then
         properties = FFI::MemoryPointer::new( :cl_context_properties, options[:properties].length + 1 )
         options[:properties].each_with_index { |e,i|
-          properties[i].write_cl_context_properties(e)
+          properties[i].write_cl_context_properties(e.respond_to?(:to_ptr) ? e : e.to_i)
         }
         properties[options[:properties].length].write_cl_context_properties(0)
       end
@@ -259,6 +263,8 @@ module OpenCL
       :cl_device_local_mem_type => Device::LocalMemType,
       :cl_device_exec_capabilities => Device::ExecCapabilities,
       :cl_command_queue_properties => CommandQueue::Properties,
+      :cl_queue_priority_khr => CommandQueue::PriorityKHR,
+      :cl_queue_throttle_khr => CommandQueue::ThrottleKHR,
       :cl_device_affinity_domain => Device::AffinityDomain,
       :cl_device_svm_capabilities => Device::SVMCapabilities,
       :cl_channel_order => ChannelOrder,
@@ -289,6 +295,14 @@ module OpenCL
   private_constant :InnerInterface
   extend InnerInterface
 
+  class Enum
+    include InnerInterface
+  end
+
+  class Bitfield
+    include InnerInterface
+  end
+
   module InnerGenerator
 
     private
@@ -324,24 +338,10 @@ EOF
         ptr1 = FFI::MemoryPointer::new( :size_t, 1)
         error = OpenCL.clGet#{klass_name}Info(self, #{klass}::#{name}, 0, nil, ptr1)
         error_check(error)
-EOF
-      if ( klass == "Device" and name == "PARTITION_TYPE" ) or ( klass == "Context" and name == "PROPERTIES" ) then
-        s+= <<EOF
-        return [] if ptr1.read_size_t == 0
-EOF
-      end
-      s += <<EOF
         ptr2 = FFI::MemoryPointer::new( ptr1.read_size_t )
         error = OpenCL.clGet#{klass_name}Info(self, #{klass}::#{name}, ptr1.read_size_t, ptr2, nil)
         error_check(error)
         arr = ptr2.get_array_of_#{type}(0, ptr1.read_size_t/ FFI.find_type(:#{type}).size)
-EOF
-      if ( klass == "Device" and ( name == "PARTITION_TYPE" or name == "PARTITION_PROPERTIES" ) ) or ( klass == "Context" and name == "PROPERTIES" ) then
-        s+= <<EOF
-        arr.reject! { |e| e.null? }
-EOF
-      end
-      s+= <<EOF
         return arr
       end
 EOF

data/lib/opencl_ruby_ffi/opencl_ruby_ffi_base_gen.rb

@@ -252,6 +252,7 @@ module OpenCL
   MEM_HOST_NO_ACCESS = (1 << 9)
   MEM_SVM_FINE_GRAIN_BUFFER = (1 << 10)
   MEM_SVM_ATOMICS = (1 << 11)
+  MEM_KERNEL_READ_AND_WRITE = (1 << 12)
   MIGRATE_MEM_OBJECT_HOST = (1 << 0)
   MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED = (1 << 1)
   R = 0x10B0
@@ -472,6 +473,10 @@ module OpenCL
   GLX_DISPLAY_KHR = 0x200A
   WGL_HDC_KHR = 0x200B
   CGL_SHAREGROUP_KHR = 0x200C
+  COMMAND_GL_FENCE_SYNC_OBJECT_KHR = 0x200D
+  COMMAND_EGL_FENCE_SYNC_OBJECT_KHR = 0x202F
+  COMMAND_ACQUIRE_EGL_OBJECTS_KHR = 0x202D
+  COMMAND_RELEASE_EGL_OBJECTS_KHR = 0x202E
   DEVICE_HALF_FP_CONFIG = 0x1033
   PLATFORM_ICD_SUFFIX_KHR = 0x0920
   PLATFORM_NOT_FOUND_KHR = -1001
@@ -508,6 +513,12 @@ module OpenCL
   QUEUE_THROTTLE_HIGH_KHR = (1<<0)
   QUEUE_THROTTLE_MED_KHR = (1<<1)
   QUEUE_THROTTLE_LOW_KHR = (1<<2)
+  COMMAND_ACQUIRE_DX9_MEDIA_SURFACES_KHR = 0x202B
+  COMMAND_RELEASE_DX9_MEDIA_SURFACES_KHR = 0x202C
+  COMMAND_ACQUIRE_D3D10_OBJECTS_KHR = 0x4017
+  COMMAND_RELEASE_D3D10_OBJECTS_KHR = 0x4018
+  COMMAND_ACQUIRE_D3D11_OBJECTS_KHR = 0x4020
+  COMMAND_RELEASE_D3D11_OBJECTS_KHR = 0x4021
   #:startdoc:
   # Parent claas to map OpenCL errors, and is used to raise unknown errors
   class Error < StandardError
@@ -543,6 +554,33 @@ module OpenCL
       return "#{@code}"
     end
 
+    # Represents the OpenCL CL_INVALID_PARTITION_NAME_EXT error
+    class INVALID_PARTITION_NAME_EXT
+
+      # Initilizes code to -1059
+      def initialize
+        super(-1059)
+      end
+
+      # Returns a string representing the name corresponding to the error classe
+      def self.name
+        return "INVALID_PARTITION_NAME_EXT"
+      end
+
+      # Returns a string representing the name corresponding to the error
+      def name
+        return "INVALID_PARTITION_NAME_EXT"
+      end
+
+      def self.code
+        return -1059
+      end
+
+    end
+
+    CLASSES[-1059] = INVALID_PARTITION_NAME_EXT
+    InvalidPartitionNameExt = INVALID_PARTITION_NAME_EXT
+
     # Represents the OpenCL CL_PLATFORM_NOT_FOUND_KHR error
     class PLATFORM_NOT_FOUND_KHR < Error
 
@@ -2345,22 +2383,27 @@ module OpenCL
   FFI.typedef :cl_uint, :cl_gl_texture_info
   FFI.typedef :cl_uint, :cl_gl_platform_info
   FFI.typedef :cl_uint, :cl_gl_context_info
+  FFI.typedef :cl_uint, :cl_queue_priority_khr
+  FFI.typedef :cl_uint, :cl_queue_throttle_khr
   # A parent class to represent OpenCL enums that use :cl_uint
   class Enum
 #    extend FFI::DataConverter
 #    native_type :cl_uint
-    @@codes = {}
+    class << self
+      attr_reader :codes
+    end
+    @codes = {}
 
     # Initializes an enum with the given val
     def initialize( val )
-      OpenCL::check_error( OpenCL::INVALID_VALUE ) if not @@codes[val]
+      error_check( OpenCL::INVALID_VALUE ) if not self.class.codes[val]
       super()
       @val = val
     end
 
     # Sets the internal value of the enum
     def val=(v)
-      OpenCL::check_error( OpenCL::INVALID_VALUE ) if not @@codes[val]
+      error_check( OpenCL::INVALID_VALUE ) if not self.class.codes[val]
       @val = v
     end
 
@@ -2374,11 +2417,27 @@ module OpenCL
       return true if @val == val
     end
 
+    # Returns a String corresponding to the Enum description
+    def inspect
+      return "#<#{self.class.name}: #{self.name}>"
+    end
+
     # Returns a String corresponfing to the Enum value
     def to_s
       return "#{self.name}"
     end
 
+    # Returns a String representing the Enum value name
+    def name
+      return self.class.codes[@val]
+    end
+
+    # Enum should be considered an integer
+    def coerce(other)
+      return [other, FFI::Pointer::new(self.to_i)] if other.is_a?(FFI::Pointer)
+      return [other, self.to_i]
+    end
+
     # Returns the integer representing the Enum value
     def to_i
       return @val
@@ -2436,9 +2495,14 @@ module OpenCL
       return false
     end
 
+    # Returns a String corresponding to the Bitfield description
+    def inspect
+      return "#<#{self.class.name}: #{self}>"
+    end
+
     # Returns a String corresponfing to the Bitfield value
     def to_s
-      return "#{self.names}"
+      return "#{self.names.join('|')}"
     end
 
     # Returns the integer representing the Bitfield value
@@ -2451,6 +2515,11 @@ module OpenCL
       return @val
     end
 
+    # Bitfield should be considered an integer
+    def coerce(other)
+      return [other, self.to_i]
+    end
+
     # Returns the bitwise & operation between f and the internal Bitfield representation
     def &(f)
       return self.class::new( @val & f )
@@ -2696,6 +2765,23 @@ module OpenCL
   end
 
   class Device
+    # Enum that maps the :cl_device_partition_property type
+    class Partition < EnumInt
+      EQUALLY = 0x1086
+      BY_COUNTS = 0x1087
+      BY_COUNTS_LIST_END = 0x0
+      BY_AFFINITY_DOMAIN = 0x1088
+      BY_NAMES_EXT = 0x4052
+      BY_NAMES_LIST_END_EXT = -1
+      @codes = {}
+      @codes[0x1086] = 'EQUALLY'
+      @codes[0x1087] = 'BY_COUNTS'
+      @codes[0x0] = 'BY_COUNTS_LIST_END'
+      @codes[0x1088] = 'BY_AFFINITY_DOMAIN'
+      @codes[0x4052] = 'BY_NAMES_EXT'
+      @codes[-1] = 'BY_NAMES_LIST_END_EXT'
+    end
+
     # Bitfield that maps the :cl_device_type type
     class Type < Bitfield
       DEFAULT = (1 << 0)
@@ -2753,25 +2839,19 @@ module OpenCL
       NONE = 0x0
       READ_ONLY_CACHE = 0x1
       READ_WRITE_CACHE = 0x2
-      @@codes[0x0] = 'NONE'
-      @@codes[0x1] = 'READ_ONLY_CACHE'
-      @@codes[0x2] = 'READ_WRITE_CACHE'
-      # Returns a String representing the Enum value name
-      def name
-        return @@codes[@val]
-      end
+      @codes = {}
+      @codes[0x0] = 'NONE'
+      @codes[0x1] = 'READ_ONLY_CACHE'
+      @codes[0x2] = 'READ_WRITE_CACHE'
     end
 
     # Enum that maps the :cl_device_local_mem_type type
     class LocalMemType < Enum
       LOCAL = 0x1
       GLOBAL = 0x2
-      @@codes[0x1] = 'LOCAL'
-      @@codes[0x2] = 'GLOBAL'
-      # Returns a String representing the Enum value name
-      def name
-        return @@codes[@val]
-      end
+      @codes = {}
+      @codes[0x1] = 'LOCAL'
+      @codes[0x2] = 'GLOBAL'
     end
 
     # Bitfield that maps the :cl_device_affinity_domain type
@@ -2850,6 +2930,40 @@ module OpenCL
   
   end
 
+  class Context
+    class Properties < Enum
+      PLATFORM = 0x1084
+      INTEROP_USER_SYNC = 0x1085
+      D3D10_DEVICE_KHR = 0x4014
+      ADAPTER_D3D9_KHR = 0x2025
+      ADAPTER_D3D9EX_KHR = 0x2026
+      ADAPTER_DXVA_KHR = 0x2027
+      GL_CONTEXT_KHR = 0x2008
+      CGL_SHAREGROUP_KHR = 0x200C
+      EGL_DISPLAY_KHR = 0x2009
+      GLX_DISPLAY_KHR = 0x200A
+      WGL_HDC_KHR = 0x200B
+      D3D11_DEVICE_KHR = 0x401D
+      MEMORY_INITIALIZE_KHR = 0x2030
+      TERMINATE_KHR = 0x2032
+      @codes = {}
+      @codes[0x1084] = 'PLATFORM'
+      @codes[0x1085] = 'INTEROP_USER_SYNC'
+      @codes[0x4014] = 'D3D10_DEVICE_KHR'
+      @codes[0x2025] = 'ADAPTER_D3D9_KHR'
+      @codes[0x2026] = 'ADAPTER_D3D9EX_KHR'
+      @codes[0x2027] = 'ADAPTER_DXVA_KHR'
+      @codes[0x2008] = 'GL_CONTEXT_KHR'
+      @codes[0x200C] = 'CGL_SHAREGROUP_KHR'
+      @codes[0x2009] = 'EGL_DISPLAY_KHR'
+      @codes[0x200A] = 'GLX_DISPLAY_KHR'
+      @codes[0x200B] = 'WGL_HDC_KHR'
+      @codes[0x401D] = 'D3D11_DEVICE_KHR'
+      @codes[0x2030] = 'MEMORY_INITIALIZE_KHR'
+      @codes[0x2032] = 'TERMINATE_KHR'
+    end
+  end
+
   class CommandQueue < FFI::ManagedStruct
     layout :dummy, :pointer
     #:stopdoc:
@@ -2864,13 +2978,13 @@ module OpenCL
     SIZE = 0x1094
     DEVICE_DEFAULT = 0x1095
     PRIORITY_KHR = 0x1096
-    PRIORITY_HIGH_KHR = (1<<0)
-    PRIORITY_MED_KHR = (1<<1)
-    PRIORITY_LOW_KHR = (1<<2)
+    PRIORITY_HIGH_KHR = (1 << 0)
+    PRIORITY_MED_KHR = (1 << 1)
+    PRIORITY_LOW_KHR = (1 << 2)
     THROTTLE_KHR = 0x1097
-    THROTTLE_HIGH_KHR = (1<<0)
-    THROTTLE_MED_KHR = (1<<1)
-    THROTTLE_LOW_KHR = (1<<2) 
+    THROTTLE_HIGH_KHR = (1 << 0)
+    THROTTLE_MED_KHR = (1 << 1)
+    THROTTLE_LOW_KHR = (1 << 2)
     # Creates a new CommandQueue and retains it if specified and aplicable
     def initialize(ptr, retain = true)
       super(ptr)
@@ -2916,6 +3030,25 @@ module OpenCL
       end
     end
 
+    class PriorityKHR < Enum
+      PRIORITY_HIGH_KHR = (1 << 0)
+      PRIORITY_MED_KHR = (1 << 1)
+      PRIORITY_LOW_KHR = (1 << 2)
+      @codes = {}
+      @codes[(1 << 0)] = 'PRIORITY_HIGH_KHR'
+      @codes[(1 << 1)] = 'PRIORITY_MED_KHR'
+      @codes[(1 << 2)] = 'PRIORITY_LOW_KHR'
+    end
+
+    class ThrottleKHR < Enum
+      THROTTLE_HIGH_KHR = (1 << 0)
+      THROTTLE_MED_KHR = (1 << 1)
+      THROTTLE_LOW_KHR = (1 << 2)
+      @codes = {}
+      @codes[(1 << 0)] = 'THROTTLE_HIGH_KHR'
+      @codes[(1 << 1)] = 'THROTTLE_MED_KHR'
+      @codes[(1 << 2)] = 'THROTTLE_LOW_KHR'
+    end
   end
   class Mem < FFI::ManagedStruct
     layout :dummy, :pointer
@@ -2931,6 +3064,7 @@ module OpenCL
     HOST_NO_ACCESS = (1 << 9)
     SVM_FINE_GRAIN_BUFFER = (1 << 10)
     SVM_ATOMICS = (1 << 11)
+    KERNEL_READ_AND_WRITE = (1 << 12)
     BUFFER = 0x10F0
     IMAGE2D = 0x10F1
     IMAGE3D = 0x10F2
@@ -2996,6 +3130,9 @@ 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)
+      KERNEL_READ_AND_WRITE = (1 << 12)
       # Returns an Array of String representing the different flags set
       def names
         fs = []
@@ -3030,18 +3167,15 @@ module OpenCL
       IMAGE1D_ARRAY = 0x10F5
       IMAGE1D_BUFFER = 0x10F6
       PIPE = 0x10F7
-      @@codes[0x10F0] = 'BUFFER'
-      @@codes[0x10F1] = 'IMAGE2D'
-      @@codes[0x10F2] = 'IMAGE3D'
-      @@codes[0x10F3] = 'IMAGE2D_ARRAY'
-      @@codes[0x10F4] = 'IMAGE1D'
-      @@codes[0x10F5] = 'IMAGE1D_ARRAY'
-      @@codes[0x10F6] = 'IMAGE1D_BUFFER'
-      @@codes[0x10F7] = 'PIPE'
-      # Returns a String representing the Enum value name
-      def name
-        return @@codes[@val]
-      end
+      @codes = {}
+      @codes[0x10F0] = 'BUFFER'
+      @codes[0x10F1] = 'IMAGE2D'
+      @codes[0x10F2] = 'IMAGE3D'
+      @codes[0x10F3] = 'IMAGE2D_ARRAY'
+      @codes[0x10F4] = 'IMAGE1D'
+      @codes[0x10F5] = 'IMAGE1D_ARRAY'
+      @codes[0x10F6] = 'IMAGE1D_BUFFER'
+      @codes[0x10F7] = 'PIPE'
     end
 
     # Bitfield that maps the :cl_svm_mem_flags type
@@ -3123,15 +3257,12 @@ module OpenCL
       LIBRARY = 0x2
       EXECUTABLE = 0x4
       INTERMEDIATE = 0x40E1
-      @@codes[0x0] = 'NONE'
-      @@codes[0x1] = 'COMPILED_OBJECT'
-      @@codes[0x2] = 'LIBRARY'
-      @@codes[0x4] = 'EXECUTABLE'
-      @@codes[0x40E1] = 'INTERMEDIATE'
-      # Returns a String representing the Enum value name
-      def name
-        return @@codes[@val]
-      end
+      @codes = {}
+      @codes[0x0] = 'NONE'
+      @codes[0x1] = 'COMPILED_OBJECT'
+      @codes[0x2] = 'LIBRARY'
+      @codes[0x4] = 'EXECUTABLE'
+      @codes[0x40E1] = 'INTERMEDIATE'
     end
 
   end
@@ -3235,14 +3366,11 @@ module OpenCL
         LOCAL = 0x119C
         CONSTANT = 0x119D
         PRIVATE = 0x119E
-        @@codes[0x119B] = 'GLOBAL'
-        @@codes[0x119C] = 'LOCAL'
-        @@codes[0x119D] = 'CONSTANT'
-        @@codes[0x119E] = 'PRIVATE'
-        # Returns a String representing the Enum value name
-        def name
-          return @@codes[@val]
-        end
+        @codes = {}
+        @codes[0x119B] = 'GLOBAL'
+        @codes[0x119C] = 'LOCAL'
+        @codes[0x119D] = 'CONSTANT'
+        @codes[0x119E] = 'PRIVATE'
       end
 
       # Enum that maps the :cl_kernel_arg_access_qualifier type
@@ -3251,14 +3379,11 @@ module OpenCL
         WRITE_ONLY = 0x11A1
         READ_WRITE = 0x11A2
         NONE = 0x11A3
-        @@codes[0x11A0] = 'READ_ONLY'
-        @@codes[0x11A1] = 'WRITE_ONLY'
-        @@codes[0x11A2] = 'READ_WRITE'
-        @@codes[0x11A3] = 'NONE'
-        # Returns a String representing the Enum value name
-        def name
-          return @@codes[@val]
-        end
+        @codes = {}
+        @codes[0x11A0] = 'READ_ONLY'
+        @codes[0x11A1] = 'WRITE_ONLY'
+        @codes[0x11A2] = 'READ_WRITE'
+        @codes[0x11A3] = 'NONE'
       end
 
       # Bitfield that maps the :cl_kernel_arg_type_qualifier type
@@ -3357,29 +3482,6 @@ module OpenCL
       end
     end
   
-  end
-
-  class Sampler
-    # Enum that maps the :cl_sampler_properties
-    class Type < Enum
-      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'
-      # Returns a String representing the Enum value name
-      def name
-        return @@codes[@val]
-      end
-    end
-
   end
   class GLsync < FFI::ManagedStruct
     layout :dummy, :pointer
@@ -3437,30 +3539,27 @@ module OpenCL
       return 0x10C2
     end
     ABGR = 0x10C3
-    @@codes[0x10B0] = 'R'
-    @@codes[0x10B1] = 'A'
-    @@codes[0x10B2] = 'RG'
-    @@codes[0x10B3] = 'RA'
-    @@codes[0x10B4] = 'RGB'
-    @@codes[0x10B5] = 'RGBA'
-    @@codes[0x10B6] = 'BGRA'
-    @@codes[0x10B7] = 'ARGB'
-    @@codes[0x10B8] = 'INTENSITY'
-    @@codes[0x10B9] = 'LUMINANCE'
-    @@codes[0x10BA] = 'Rx'
-    @@codes[0x10BB] = 'RGx'
-    @@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'
-    # Returns a String representing the Enum value name
-    def name
-      return @@codes[@val]
-    end
+    @codes = {}
+    @codes[0x10B0] = 'R'
+    @codes[0x10B1] = 'A'
+    @codes[0x10B2] = 'RG'
+    @codes[0x10B3] = 'RA'
+    @codes[0x10B4] = 'RGB'
+    @codes[0x10B5] = 'RGBA'
+    @codes[0x10B6] = 'BGRA'
+    @codes[0x10B7] = 'ARGB'
+    @codes[0x10B8] = 'INTENSITY'
+    @codes[0x10B9] = 'LUMINANCE'
+    @codes[0x10BA] = 'Rx'
+    @codes[0x10BB] = 'RGx'
+    @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'
   end
 
   # Enum that maps the :cl_channel_type type
@@ -3482,27 +3581,24 @@ module OpenCL
     FLOAT = 0x10DE
     UNORM_INT24 = 0x10DF
     UNORM_INT_101010_2 = 0x10E0
-    @@codes[0x10D0] = 'SNORM_INT8'
-    @@codes[0x10D1] = 'SNORM_INT16'
-    @@codes[0x10D2] = 'UNORM_INT8'
-    @@codes[0x10D3] = 'UNORM_INT16'
-    @@codes[0x10D4] = 'UNORM_SHORT_565'
-    @@codes[0x10D5] = 'UNORM_SHORT_555'
-    @@codes[0x10D6] = 'UNORM_INT_101010'
-    @@codes[0x10D7] = 'SIGNED_INT8'
-    @@codes[0x10D8] = 'SIGNED_INT16'
-    @@codes[0x10D9] = 'SIGNED_INT32'
-    @@codes[0x10DA] = 'UNSIGNED_INT8'
-    @@codes[0x10DB] = 'UNSIGNED_INT16'
-    @@codes[0x10DC] = 'UNSIGNED_INT32'
-    @@codes[0x10DD] = 'HALF_FLOAT'
-    @@codes[0x10DE] = 'FLOAT'
-    @@codes[0x10DF] = 'UNORM_INT24'
-    @@codes[0x10E0] = 'UNORM_INT_101010_2'
-    # Returns a String representing the Enum value name
-    def name
-      return @@codes[@val]
-    end
+    @codes = {}
+    @codes[0x10D0] = 'SNORM_INT8'
+    @codes[0x10D1] = 'SNORM_INT16'
+    @codes[0x10D2] = 'UNORM_INT8'
+    @codes[0x10D3] = 'UNORM_INT16'
+    @codes[0x10D4] = 'UNORM_SHORT_565'
+    @codes[0x10D5] = 'UNORM_SHORT_555'
+    @codes[0x10D6] = 'UNORM_INT_101010'
+    @codes[0x10D7] = 'SIGNED_INT8'
+    @codes[0x10D8] = 'SIGNED_INT16'
+    @codes[0x10D9] = 'SIGNED_INT32'
+    @codes[0x10DA] = 'UNSIGNED_INT8'
+    @codes[0x10DB] = 'UNSIGNED_INT16'
+    @codes[0x10DC] = 'UNSIGNED_INT32'
+    @codes[0x10DD] = 'HALF_FLOAT'
+    @codes[0x10DE] = 'FLOAT'
+    @codes[0x10DF] = 'UNORM_INT24'
+    @codes[0x10E0] = 'UNORM_INT_101010_2'
   end
 
   # Enum that maps the :cl_addressing_mode type
@@ -3512,27 +3608,21 @@ module OpenCL
     CLAMP = 0x1132
     REPEAT = 0x1133
     MIRRORED_REPEAT = 0x1134
-    @@codes[0x1130] = 'NONE'
-    @@codes[0x1131] = 'CLAMP_TO_EDGE'
-    @@codes[0x1132] = 'CLAMP'
-    @@codes[0x1133] = 'REPEAT'
-    @@codes[0x1134] = 'MIRRORED_REPEAT'
-    # Returns a String representing the Enum value name
-    def name
-      return @@codes[@val]
-    end
+    @codes = {}
+    @codes[0x1130] = 'NONE'
+    @codes[0x1131] = 'CLAMP_TO_EDGE'
+    @codes[0x1132] = 'CLAMP'
+    @codes[0x1133] = 'REPEAT'
+    @codes[0x1134] = 'MIRRORED_REPEAT'
   end
 
   # Enum that maps the :cl_filter_mode type
   class FilterMode < Enum
     NEAREST = 0x1140
     LINEAR = 0x1141
-    @@codes[0x1140] = 'NEAREST'
-    @@codes[0x1141] = 'LINEAR'
-    # Returns a String representing the Enum value name
-    def name
-      return @@codes[@val]
-    end
+    @codes = {}
+    @codes[0x1140] = 'NEAREST'
+    @codes[0x1141] = 'LINEAR'
   end
 
   # Bitfield that maps the :cl_map_flags type
@@ -3582,40 +3672,57 @@ module OpenCL
     SVM_MEMFILL = 0x120B
     SVM_MAP = 0x120C
     SVM_UNMAP = 0x120D
-    @@codes[0x11F0] = 'NDRANGE_KERNEL'
-    @@codes[0x11F1] = 'TASK'
-    @@codes[0x11F2] = 'NATIVE_KERNEL'
-    @@codes[0x11F3] = 'READ_BUFFER'
-    @@codes[0x11F4] = 'WRITE_BUFFER'
-    @@codes[0x11F5] = 'COPY_BUFFER'
-    @@codes[0x11F6] = 'READ_IMAGE'
-    @@codes[0x11F7] = 'WRITE_IMAGE'
-    @@codes[0x11F8] = 'COPY_IMAGE'
-    @@codes[0x11F9] = 'COPY_IMAGE_TO_BUFFER'
-    @@codes[0x11FA] = 'COPY_BUFFER_TO_IMAGE'
-    @@codes[0x11FB] = 'MAP_BUFFER'
-    @@codes[0x11FC] = 'MAP_IMAGE'
-    @@codes[0x11FD] = 'UNMAP_MEM_OBJECT'
-    @@codes[0x11FE] = 'MARKER'
-    @@codes[0x11FF] = 'ACQUIRE_GL_OBJECTS'
-    @@codes[0x1200] = 'RELEASE_GL_OBJECTS'
-    @@codes[0x1201] = 'READ_BUFFER_RECT'
-    @@codes[0x1202] = 'WRITE_BUFFER_RECT'
-    @@codes[0x1203] = 'COPY_BUFFER_RECT'
-    @@codes[0x1204] = 'USER'
-    @@codes[0x1205] = 'BARRIER'
-    @@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'
-    # Returns a String representing the Enum value name
-    def name
-      return @@codes[@val]
-    end
+    GL_FENCE_SYNC_OBJECT_KHR = 0x200D
+    ACQUIRE_DX9_MEDIA_SURFACES_KHR = 0x202B
+    RELEASE_DX9_MEDIA_SURFACES_KHR = 0x202C
+    EGL_FENCE_SYNC_OBJECT_KHR = 0x202F
+    ACQUIRE_EGL_OBJECTS_KHR = 0x202D
+    RELEASE_EGL_OBJECTS_KHR = 0x202E
+    ACQUIRE_D3D10_OBJECTS_KHR = 0x4017
+    RELEASE_D3D10_OBJECTS_KHR = 0x4018
+    ACQUIRE_D3D11_OBJECTS_KHR = 0x4020
+    RELEASE_D3D11_OBJECTS_KHR = 0x4021
+    @codes = {}
+    @codes[0x11F0] = 'NDRANGE_KERNEL'
+    @codes[0x11F1] = 'TASK'
+    @codes[0x11F2] = 'NATIVE_KERNEL'
+    @codes[0x11F3] = 'READ_BUFFER'
+    @codes[0x11F4] = 'WRITE_BUFFER'
+    @codes[0x11F5] = 'COPY_BUFFER'
+    @codes[0x11F6] = 'READ_IMAGE'
+    @codes[0x11F7] = 'WRITE_IMAGE'
+    @codes[0x11F8] = 'COPY_IMAGE'
+    @codes[0x11F9] = 'COPY_IMAGE_TO_BUFFER'
+    @codes[0x11FA] = 'COPY_BUFFER_TO_IMAGE'
+    @codes[0x11FB] = 'MAP_BUFFER'
+    @codes[0x11FC] = 'MAP_IMAGE'
+    @codes[0x11FD] = 'UNMAP_MEM_OBJECT'
+    @codes[0x11FE] = 'MARKER'
+    @codes[0x11FF] = 'ACQUIRE_GL_OBJECTS'
+    @codes[0x1200] = 'RELEASE_GL_OBJECTS'
+    @codes[0x1201] = 'READ_BUFFER_RECT'
+    @codes[0x1202] = 'WRITE_BUFFER_RECT'
+    @codes[0x1203] = 'COPY_BUFFER_RECT'
+    @codes[0x1204] = 'USER'
+    @codes[0x1205] = 'BARRIER'
+    @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'
+    @codes[0x200D] = 'GL_FENCE_SYNC_OBJECT_KHR'
+    @codes[0x202B] = 'ACQUIRE_DX9_MEDIA_SURFACES_KHR'
+    @codes[0x202C] = 'RELEASE_DX9_MEDIA_SURFACES_KHR'
+    @codes[0x202F] = 'EGL_FENCE_SYNC_OBJECT_KHR'
+    @codes[0x202D] = 'ACQUIRE_EGL_OBJECTS_KHR'
+    @codes[0x202E] = 'RELEASE_EGL_OBJECTS_KHR'
+    @codes[0x4017] = 'ACQUIRE_D3D10_OBJECTS_KHR'
+    @codes[0x4018] = 'RELEASE_D3D10_OBJECTS_KHR'
+    @codes[0x4020] = 'ACQUIRE_D3D11_OBJECTS_KHR'
+    @codes[0x4021] = 'RELEASE_D3D11_OBJECTS_KHR'
   end
 
   # Enum that maps the :cl_gl_object_type type
@@ -3628,18 +3735,15 @@ module OpenCL
     TEXTURE1D = 0x200F
     TEXTURE1D_ARRAY = 0x2010
     TEXTURE_BUFFER = 0x2011
-    @@codes[0x2000] = 'BUFFER'
-    @@codes[0x2001] = 'TEXTURE2D'
-    @@codes[0x2002] = 'TEXTURE3D'
-    @@codes[0x2003] = 'RENDERBUFFER'
-    @@codes[0x200E] = 'TEXTURE2D_ARRAY'
-    @@codes[0x200F] = 'TEXTURE1D'
-    @@codes[0x2010] = 'TEXTURE1D_ARRAY'
-    @@codes[0x2011] = 'TEXTURE_BUFFER'
-    # Returns a String representing the Enum value name
-    def name
-      return @@codes[@val]
-    end
+    @codes = {}
+    @codes[0x2000] = 'BUFFER'
+    @codes[0x2001] = 'TEXTURE2D'
+    @codes[0x2002] = 'TEXTURE3D'
+    @codes[0x2003] = 'RENDERBUFFER'
+    @codes[0x200E] = 'TEXTURE2D_ARRAY'
+    @codes[0x200F] = 'TEXTURE1D'
+    @codes[0x2010] = 'TEXTURE1D_ARRAY'
+    @codes[0x2011] = 'TEXTURE_BUFFER'
   end
 
   # Enum that maps the :cl_build_status type
@@ -3648,14 +3752,11 @@ module OpenCL
     NONE = -1
     ERROR = -2
     IN_PROGRESS = -3
-    @@codes[0] = 'SUCCESS'
-    @@codes[-1] = 'NONE'
-    @@codes[-2] = 'ERROR'
-    @@codes[-3] = 'IN_PROGRESS'
-    # Returns a String representing the Enum value name
-    def name
-      return @@codes[@val]
-    end
+    @codes = {}
+    @codes[0] = 'SUCCESS'
+    @codes[-1] = 'NONE'
+    @codes[-2] = 'ERROR'
+    @codes[-3] = 'IN_PROGRESS'
   end
 
   # Enum that maps the command execution status logical type
@@ -3664,14 +3765,11 @@ module OpenCL
     RUNNING = 0x1
     SUBMITTED = 0x2
     QUEUED = 0x3
-    @@codes[0x0] = 'COMPLETE'
-    @@codes[0x1] = 'RUNNING'
-    @@codes[0x2] = 'SUBMITTED'
-    @@codes[0x3] = 'QUEUED'
-    # Returns a String representing the Enum value name
-    def name
-      return @@codes[@val]
-    end
+    @codes = {}
+    @codes[0x0] = 'COMPLETE'
+    @codes[0x1] = 'RUNNING'
+    @codes[0x2] = 'SUBMITTED'
+    @codes[0x3] = 'QUEUED'
   end
 
   class Image < Mem