opengl3 0.0.1.pre6 → 0.0.2.pre1

data/README.md

@@ -26,8 +26,6 @@ with C-style OpenGL entrypoints.
 Please take a look at `lib/opengl/wrapper/**/*.rb`
 to see if entrypoints are wrapped.
 
-
-
 * `glGetString(pname)` -> `String`
 * `glGen...`-like functions
   - `glGenTextures(count)` -> `Array<Integer>`
@@ -47,6 +45,10 @@ to see if entrypoints are wrapped.
 * `glShaderSource(shader, Array<String>)`
 * `glGetShaderInfoLog(shader)` -> `String`
 * `glGetProgramInfoLog(program)` -> `String`
+* `glDrawElements`, `glDrawRangeElements` and its family
+  - its `indices` argument can be an Integer as offset in bytes
+* `glVertexAttribPointer` and its family
+  - its `pointer` argument can be an Integer as offset in bytes
 * More Ruby-style functions coming soon
 
 block-style glMapBuffer / glMapBufferRange:
@@ -64,7 +66,6 @@ And helper functions
 * `glGetAvailableExtensions()` -> `Array<String>`
 * `glIsShaderCompiled?(shader)` -> `Boolean`
 * `glIsProgramLinked?(program)` -> `Boolean`
-* `glUniformMatrixf(location, Matrix, transpose = true)` (Experimental)
 * More helper functions coming soon
 
 Note for functions has a offset with GLvoid* type

data/lib/opengl/error.rb

@@ -0,0 +1,2 @@
+module OpenGL
+end

data/lib/opengl/gl.rb

@@ -1,6 +1,7 @@
 require_relative "constants"
 require_relative "platform"
 require_relative "type"
+require_relative "pointer_ext"
 require_relative "raw"
 require_relative "wrapper"
 require_relative "debugging"

data/lib/opengl/pointer_ext.rb

@@ -0,0 +1,24 @@
+require_relative "type"
+
+module OpenGL
+  module PointerExt
+    Type.primitive_types.each do |gl_type, old_type|
+      code = <<-RUBY
+        def read_array_of_#{gl_type}(n)
+          read_array_of_#{old_type}(n)
+        end
+        def get_array_of_#{gl_type}(off, n)
+          get_array_of_#{old_type}(off, n)
+        end
+        def write_array_of_#{gl_type}(ary)
+          write_array_of_#{old_type}(ary)
+        end
+        def put_array_of_#{gl_type}(off, ary)
+          put_array_of_#{old_type}(off, ary)
+        end
+      RUBY
+      
+      module_eval code, __FILE__, __LINE__
+    end
+  end
+end

data/lib/opengl/type.rb

@@ -8,16 +8,26 @@ module OpenGL
     # Root path of type definition files
     ROOT = File.expand_path("../type", __FILE__)
     
+    # @private
     default_path = File.join(ROOT, "default.yml")
     platform_path = File.join(ROOT, "#{FFI::Platform::NAME}.yml")
+    
+    # @private
     @primitive_types = YAML.load(File.read(default_path)).merge!(
                          YAML.load(File.read(platform_path))
                        )
     
+    # @!attribute [r] primitive_types
+    #   @return [Hash] the table of primitive types
+    def self.primitive_types
+      return @primitive_types
+    end
+    
+    # @private
     @type_map = Hash[
-                  @primitive_types.to_a +
-                  @primitive_types.keys.map {|t| [:"#{t}_in", :buffer_in] } +
-                  @primitive_types.keys.map {|t| [:"#{t}_out", :buffer_out] }
+                  primitive_types.to_a +
+                  primitive_types.keys.map {|t| [:"#{t}_in", :buffer_in] } +
+                  primitive_types.keys.map {|t| [:"#{t}_out", :buffer_out] }
                 ].merge!({
                   :pointer_out => :buffer_out, :pointer_in => :buffer_in,
                   :void => :void, :string => :string, :pointer => :pointer,
@@ -34,61 +44,46 @@ module OpenGL
       return @type_map.fetch(type.to_sym)
     end
     
-    # @private
-    MemoryPointerInstanceMethods = Module.new
-    @primitive_types.each do |gl_type, old_type|
-      code = <<-RUBY
-        def read_array_of_#{gl_type}(n)
-          read_array_of_#{old_type}(n)
-        end
-        def get_array_of_#{gl_type}(off, n)
-          get_array_of_#{old_type}(off, n)
-        end
-        def write_array_of_#{gl_type}(ary)
-          write_array_of_#{old_type}(ary)
-        end
-        def put_array_of_#{gl_type}(off, ary)
-          put_array_of_#{old_type}(off, ary)
-        end
-      RUBY
-      MemoryPointerInstanceMethods.module_eval code, __FILE__, __LINE__
-    end
-    
-    @primitive_types.each do |gl_type, old_type|
-      code = <<-RUBY
-        def self.#{gl_type}(n)
-          ptr = pointer(FFI::MemoryPointer.new(:#{old_type}, n))
-          if block_given?
-            yield ptr
-          else
-            return ptr
-          end
-        end
-      RUBY
-      self.module_eval code, __FILE__, __LINE__
+    # Create a buffer for input argument
+    #
+    # @param [Symbol] gl_type
+    # @param [Integer] count
+    #
+    # @overload buffer_in(gl_type, count)
+    #   @return [FFI::Buffer]
+    #
+    # @overload buffer_in(gl_type, count)
+    #   @yield [buf] Give a reference of the buffer
+    #   @yieldparam [FFI::Buffer] buf
+    #   @return [Object] result of the block
+    #
+    def self.buffer_in(gl_type, count)
+      orig_type = primitive_types.fetch(gl_type)
+      ptr = FFI::Buffer.new_in(orig_type, count).extend(PointerExt)
+      return (block_given? ? (yield ptr) : (ptr))
     end
     
+    # Create a buffer for output argument
     #
-    # @overload pointer(count)
-    #   Create a memory pointer (FFI::MemoryPointer) with pointer type
-    #   @param [Integer] count
-    #   @return [FFI::MemoryPointer] with sizeof(pointer) * count
+    # @param [Symbol] gl_type
+    # @param [Integer] count
     #
-    # @overload pointer(ptr)
-    #   Ensure the pointer can work with the library
-    #   If ptr is NULL (#null? == true), it returns nil
-    #   @param [FFI::Pointer] ptr
-    #   @return [FFI::Pointer] ptr (extended with extensions)
+    # @overload buffer_out(gl_type, count)
+    #   @return [FFI::Buffer]
     #
-    def self.pointer(ptr)
-      if ptr.is_a? Integer
-        ptr = FFI::MemoryPointer.new(:pointer, n)
-      end
-      ptr.extend MemoryPointerInstanceMethods
-      ptr.null? ? nil : ptr
+    # @overload buffer_out(gl_type, count)
+    #   @yield [buf] Give a reference of the buffer
+    #   @yieldparam [FFI::Buffer] buf
+    #   @return [Object] result of the block
+    #
+    def self.buffer_out(gl_type, count)
+      orig_type = primitive_types.fetch(gl_type)
+      ptr = FFI::Buffer.new_out(orig_type, count).extend(PointerExt)
+      return (block_given? ? (yield ptr) : (ptr))
     end
     
     # Make sure offset is a pointer type
+    #
     # @param [Integer, FFI::Pointer, nil] offset
     # @return [FFI::Pointer]
     #

data/lib/opengl/version.rb

@@ -1,3 +1,3 @@
 module OpenGL
-  VERSION = "0.0.1.pre6"
+  VERSION = "0.0.2.pre1"
 end

data/lib/opengl/wrapper/base.rb

@@ -6,27 +6,30 @@ module OpenGL
     # glGet*v
     def def_glGet(name, type)
       define_method(:"glGet#{name}v") do |*args, count|
-        ptr = Type.send(:"#{type}", count)
-        super(*args, ptr)
-        return ptr.send(:"read_array_of_#{type}", count)
+        return Type.buffer_out(type, count) {|ptr|
+                 super(*args, ptr)
+                 ptr.send(:"read_array_of_#{type}", count)
+               }
       end
     end
     
     # gl*v
     def def_glSet(name, type)
       define_method(:"gl#{name}v") do |*args, params|
-        ptr = Type.send(:"#{type}", params.count)
-        ptr.send(:"write_array_of_#{type}", params)
-        super(*args, ptr)
+        Type.buffer_in(type, params.count) {|ptr|
+          ptr.send(:"write_array_of_#{type}", params)
+          super(*args, ptr)
+        }
       end
     end
     
     # glGen*
     def def_glGen(type_name)
       define_method(:"glGen#{type_name}") do |count|
-        ptr = Type.GLuint(count)
-        super(count, ptr)
-        return ptr.read_array_of_GLuint(count)
+        return Type.buffer_out(:GLuint, count) {|ptr|
+                 super(count, ptr)
+                 ptr.read_array_of_GLuint(count)
+               }
       end
     end
     
@@ -34,10 +37,10 @@ module OpenGL
     def def_glDelete(type_name)
       define_method(:"glDelete#{type_name}") do |ids|
         ids = Array(ids)
-        raise ArgumentError unless ids.all?{|o| o.is_a? Integer }
-        ptr = Type.GLuint(ids.count)
-        ptr.write_array_of_GLuint(ids)
-        super(ids.count, ptr)
+        Type.buffer_in(:GLuint, ids.count) {|ptr|
+          ptr.write_array_of_GLuint(ids)
+          super(ids.count, ptr)
+        }
       end
     end
     
@@ -45,7 +48,8 @@ module OpenGL
     def def_glMapBuffer(suffix = nil)
       define_method(:"glMapBuffer#{suffix}") do |*args, &block|
         target = args.first
-        if (ptr_or_result = Type.pointer(super(*args)))
+        if (ptr_or_result = super(*args).extend(PointerExt))
+          # TODO: FFI::NullPointerError ?
           if block
             block.call ptr_or_result
             ptr_or_result = glUnmapBuffer(target)
@@ -59,9 +63,26 @@ module OpenGL
     def def_glGetInfoLog_of(name)
       define_method(:"glGet#{name}InfoLog") do |id|
         n = send(:"glGet#{name}iv", id, Constants::GL_INFO_LOG_LENGTH, 1)[0]
-        ptr = Type.GLchar(n)
-        super(id, n, nil, ptr)
-        return ptr.read_string
+        return Type.buffer_out(:GLchar, n) {|ptr|
+                 super(id, n, nil, ptr)
+                 ptr.get_string(0)
+               }
+      end
+    end
+    
+    # glVertexAttrib*Pointer
+    def def_glVertexAttribPointer(midname = nil)
+      define_method(:"glVertexAttrib#{midname}Pointer") do |*args|
+        ptr_or_offset = Type.pointer_offset(args.pop)
+        super(*args, ptr_or_offset)
+      end
+    end
+    
+    # glDraw*Elements*
+    def def_glDrawElements(midname, suffix, where_is_indices = -1)
+      define_method(:"glDraw#{midname}Elements#{suffix}") do |*args|
+        args[where_is_indices] = Type.pointer_offset(args[where_is_indices])
+        super(*args)
       end
     end
     

data/lib/opengl/wrapper/core/2_x/GL_VERSION_1_1.rb

@@ -12,5 +12,8 @@ module OpenGL
     # glGenTextures
     def_glGen 'Textures'
     
+    # glDrawElements
+    def_glDrawElements nil, nil
+    
   end
 end

data/lib/opengl/wrapper/core/2_x/GL_VERSION_1_2.rb

@@ -2,5 +2,9 @@ module OpenGL
   # Wrapper for OpenGL 1.2
   module Wrapper::GL_VERSION_1_2
     extend Wrapper::Base
+    
+    # glDrawRangeElements
+    def_glDrawElements 'Range', nil
+    
   end
 end

data/lib/opengl/wrapper/core/2_x/GL_VERSION_2_0.rb

@@ -20,7 +20,7 @@ module OpenGL
     #
     def glDrawBuffers(*bufs)
       bufs.flatten!
-      Type.GLenum(bufs.count) do |ptr|
+      Type.buffer_in(:GLenum, bufs.count) do |ptr|
         ptr.write_array_of_GLenum(bufs)
         super(bufs.count, ptr)
       end
@@ -53,6 +53,17 @@ module OpenGL
     
     # TODO: glGetShaderSource
     
+    # glGetUniformLocation
+    #
+    # @param [GLuint] program
+    # @param [string] name
+    # @return [GLint, nil]
+    #
+    def glGetUniformLocation(program, name)
+      loc = super(program, name)
+      return (loc != -1 ? loc : nil)
+    end
+    
     # glGetUniformfv 
     def_glGet 'Uniformf', :GLfloat
     
@@ -74,15 +85,16 @@ module OpenGL
     # glShaderSource
     #
     # @param [GLuint] shader
-    # @param [String, Array<String>] codes
+    # @param [String, Array<String>, FFI::Pointer, Array<FFI::Pointer>] codes
     #
     def glShaderSource(shader, codes)
       pointers = Array(codes).map{|s|
+        # TODO: FFI::Buffer ?
         s.is_a?(FFI::Pointer) ? s : FFI::MemoryPointer.from_string(s)
       }
-      ptr = FFI::MemoryPointer.new(:pointer, pointers.count)
-      ptr.write_array_of_pointer(pointers)
-      super(shader, pointers.count, ptr, nil)
+      buf = FFI::Buffer.new_in(:pointer, pointers.count)
+      buf.write_array_of_pointer(pointers)
+      super(shader, pointers.count, buf, nil)
     end
     
     # Check if the shader is successfully compiled
@@ -103,25 +115,8 @@ module OpenGL
       glGetProgramiv(program, Constants::GL_LINK_STATUS, 1)[0] != 0
     end
     
-    # a variant of glUniformMatrix*fv
-    #
-    # @param [GLint] location
-    # @param [Matrix] matrix
-    # @param [Boolean] transpose
-    #
-    def glUniformMatrixf(location, mat, transpose = true)
-      transpose = (transpose ? Constants::GL_TRUE : Constants::GL_FALSE)
-      
-      # TODO: refactor it
-      if defined?(::Matrix) && mat.is_a?(::Matrix)
-        m, n = mat.row_size, mat.column_size
-        dim = (m == n ? "#{m}" : "#{n}x#{m}")
-        
-        ptr = Type.GLfloat(m*n).write_array_of_GLfloat(mat.to_a.flatten)
-      end
-      
-      send(:"glUniformMatrix#{dim}fv", location, 1, transpose, ptr)
-    end
+    # glVertexAttribPointer
+    def_glVertexAttribPointer
     
   end
 end

data/lib/opengl/wrapper/core/3_0/GL_VERSION_3_0.rb

@@ -65,6 +65,9 @@ module OpenGL
     # glGetTexParameterIuiv
     def_glGet 'TexParameterIui', :GLuint
     
+    # glVertexAttribIPointer
+    def_glVertexAttribPointer 'I'
+    
     # TODO: glClearBufferiv
     # TODO: glClearBufferuiv
     # TODO: glClearBufferfv

data/lib/opengl/wrapper/core/3_1/GL_VERSION_3_1.rb

@@ -8,7 +8,9 @@ module OpenGL
     extend Wrapper::Base
     
     # TODO: glDrawArraysInstanced
-    # TODO: glDrawElementsInstanced
+    
+    # glDrawElementsInstanced
+    def_glDrawElements nil, 'Instanced', -2
     
   end
 end

data/lib/opengl/wrapper/core/3_2/GL_ARB_draw_elements_base_vertex.rb

@@ -3,6 +3,15 @@ module OpenGL
   module Wrapper::GL_ARB_draw_elements_base_vertex
     extend Wrapper::Base
     
+    # glDrawElementsBaseVertex
+    def_glDrawElements nil, 'BaseVertex', -2
+    
+    # glDrawRangeElementsBaseVertex
+    def_glDrawElements 'Range', 'BaseVertex', -2
+    
+    # glDrawElementsInstancedBaseVertex
+    def_glDrawElements nil, 'InstancedBaseVertex', -3
+    
     # TODO: glMultiDrawElementsBaseVertex
     
   end

data/lib/opengl/wrapper/core/4_1/GL_ARB_vertex_attrib_64bit.rb

@@ -6,5 +6,8 @@ module OpenGL
     # glGetVertexAttribLdv
     def_glGet 'VertexAttribLd', :GLdouble
     
+    # glVertexAttribLPointer
+    def_glVertexAttribPointer 'L'
+    
   end
 end

data/lib/opengl/wrapper/core/4_2/GL_ARB_base_instance.rb

@@ -2,5 +2,12 @@ module OpenGL
   # Wrapper for GL_ARB_base_instance extension
   module Wrapper::GL_ARB_base_instance
     extend Wrapper::Base
+    
+    # glDrawElementsInstancedBaseInstance
+    def_glDrawElements nil, 'InstancedBaseInstance', -3
+    
+    # glDrawElementsInstancedBaseVertexBaseInstance
+    def_glDrawElements nil, 'InstancedBaseVertexBaseInstance', -4
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opengl3
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre6
+  version: 0.0.2.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,56 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  name: ffi
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  name: rake
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  name: minitest
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.3.0
+    none: false
+  type: :development
 description: An OpenGL wrapper library for Ruby (OpenGL 2.1-4.2)
 email:
 - davll.xc@gmail.com
@@ -66,9 +66,122 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/glut/i386/freeglut.dll.gitkeep
-- lib/glut/x86_64/freeglut.dll.gitkeep
 - lib/glut.rb
+- lib/opengl.rb
+- lib/opengl/constants.rb
+- lib/opengl/debugging.rb
+- lib/opengl/error.rb
+- lib/opengl/gl.rb
+- lib/opengl/platform.rb
+- lib/opengl/pointer_ext.rb
+- lib/opengl/raw.rb
+- lib/opengl/type.rb
+- lib/opengl/version.rb
+- lib/opengl/wrapper.rb
+- lib/opengl/platform/base.rb
+- lib/opengl/platform/darwin.rb
+- lib/opengl/platform/linux.rb
+- lib/opengl/platform/windows.rb
+- lib/opengl/type/default.yml
+- lib/opengl/type/i386-linux.yml
+- lib/opengl/type/i386-windows.yml
+- lib/opengl/type/x86_64-darwin.yml
+- lib/opengl/type/x86_64-linux.yml
+- lib/opengl/type/x86_64-windows.yml
+- lib/opengl/wrapper/base.rb
+- lib/opengl/wrapper/core/2_x/GL_VERSION_1_0.rb
+- lib/opengl/wrapper/core/2_x/GL_VERSION_1_1.rb
+- lib/opengl/wrapper/core/2_x/GL_VERSION_1_2.rb
+- lib/opengl/wrapper/core/2_x/GL_VERSION_1_3.rb
+- lib/opengl/wrapper/core/2_x/GL_VERSION_1_4.rb
+- lib/opengl/wrapper/core/2_x/GL_VERSION_1_5.rb
+- lib/opengl/wrapper/core/2_x/GL_VERSION_2_0.rb
+- lib/opengl/wrapper/core/2_x/GL_VERSION_2_1.rb
+- lib/opengl/wrapper/core/3_0/GL_ARB_framebuffer_object.rb
+- lib/opengl/wrapper/core/3_0/GL_ARB_map_buffer_range.rb
+- lib/opengl/wrapper/core/3_0/GL_ARB_vertex_array_object.rb
+- lib/opengl/wrapper/core/3_0/GL_VERSION_3_0.rb
+- lib/opengl/wrapper/core/3_1/GL_ARB_copy_buffer.rb
+- lib/opengl/wrapper/core/3_1/GL_ARB_uniform_buffer_object.rb
+- lib/opengl/wrapper/core/3_1/GL_VERSION_3_1.rb
+- lib/opengl/wrapper/core/3_2/GL_ARB_draw_elements_base_vertex.rb
+- lib/opengl/wrapper/core/3_2/GL_ARB_provoking_vertex.rb
+- lib/opengl/wrapper/core/3_2/GL_ARB_sync.rb
+- lib/opengl/wrapper/core/3_2/GL_ARB_texture_multisample.rb
+- lib/opengl/wrapper/core/3_2/GL_VERSION_3_2.rb
+- lib/opengl/wrapper/core/3_3/GL_ARB_blend_func_extended.rb
+- lib/opengl/wrapper/core/3_3/GL_ARB_sampler_objects.rb
+- lib/opengl/wrapper/core/3_3/GL_ARB_timer_query.rb
+- lib/opengl/wrapper/core/3_3/GL_ARB_vertex_type_2_10_10_10_rev.rb
+- lib/opengl/wrapper/core/3_3/GL_VERSION_3_3.rb
+- lib/opengl/wrapper/core/4_0/GL_ARB_draw_indirect.rb
+- lib/opengl/wrapper/core/4_0/GL_ARB_gpu_shader_fp64.rb
+- lib/opengl/wrapper/core/4_0/GL_ARB_shader_subroutine.rb
+- lib/opengl/wrapper/core/4_0/GL_ARB_tessellation_shader.rb
+- lib/opengl/wrapper/core/4_0/GL_ARB_transform_feedback2.rb
+- lib/opengl/wrapper/core/4_0/GL_ARB_transform_feedback3.rb
+- lib/opengl/wrapper/core/4_0/GL_VERSION_4_0.rb
+- lib/opengl/wrapper/core/4_1/GL_ARB_ES2_compatibility.rb
+- lib/opengl/wrapper/core/4_1/GL_ARB_get_program_binary.rb
+- lib/opengl/wrapper/core/4_1/GL_ARB_separate_shader_objects.rb
+- lib/opengl/wrapper/core/4_1/GL_ARB_vertex_attrib_64bit.rb
+- lib/opengl/wrapper/core/4_1/GL_ARB_viewport_array.rb
+- lib/opengl/wrapper/core/4_1/GL_VERSION_4_1.rb
+- lib/opengl/wrapper/core/4_2/GL_ARB_base_instance.rb
+- lib/opengl/wrapper/core/4_2/GL_ARB_internalformat_query.rb
+- lib/opengl/wrapper/core/4_2/GL_ARB_shader_atomic_counters.rb
+- lib/opengl/wrapper/core/4_2/GL_ARB_shader_image_load_store.rb
+- lib/opengl/wrapper/core/4_2/GL_ARB_texture_storage.rb
+- lib/opengl/wrapper/core/4_2/GL_ARB_transform_feedback_instanced.rb
+- lib/opengl/wrapper/core/4_2/GL_VERSION_4_2.rb
+- lib/opengl/raw/core/2_x/GL_VERSION_1_0.yml
+- lib/opengl/raw/core/2_x/GL_VERSION_1_1.yml
+- lib/opengl/raw/core/2_x/GL_VERSION_1_2.yml
+- lib/opengl/raw/core/2_x/GL_VERSION_1_3.yml
+- lib/opengl/raw/core/2_x/GL_VERSION_1_4.yml
+- lib/opengl/raw/core/2_x/GL_VERSION_1_5.yml
+- lib/opengl/raw/core/2_x/GL_VERSION_2_0.yml
+- lib/opengl/raw/core/2_x/GL_VERSION_2_1.yml
+- lib/opengl/raw/core/3_0/GL_ARB_framebuffer_object.yml
+- lib/opengl/raw/core/3_0/GL_ARB_map_buffer_range.yml
+- lib/opengl/raw/core/3_0/GL_ARB_vertex_array_object.yml
+- lib/opengl/raw/core/3_0/GL_VERSION_3_0.yml
+- lib/opengl/raw/core/3_1/GL_ARB_copy_buffer.yml
+- lib/opengl/raw/core/3_1/GL_ARB_uniform_buffer_object.yml
+- lib/opengl/raw/core/3_1/GL_VERSION_3_1.yml
+- lib/opengl/raw/core/3_2/GL_ARB_draw_elements_base_vertex.yml
+- lib/opengl/raw/core/3_2/GL_ARB_provoking_vertex.yml
+- lib/opengl/raw/core/3_2/GL_ARB_sync.yml
+- lib/opengl/raw/core/3_2/GL_ARB_texture_multisample.yml
+- lib/opengl/raw/core/3_2/GL_VERSION_3_2.yml
+- lib/opengl/raw/core/3_3/GL_ARB_blend_func_extended.yml
+- lib/opengl/raw/core/3_3/GL_ARB_sampler_objects.yml
+- lib/opengl/raw/core/3_3/GL_ARB_timer_query.yml
+- lib/opengl/raw/core/3_3/GL_ARB_vertex_type_2_10_10_10_rev.yml
+- lib/opengl/raw/core/3_3/GL_VERSION_3_3.yml
+- lib/opengl/raw/core/4_0/GL_ARB_draw_indirect.yml
+- lib/opengl/raw/core/4_0/GL_ARB_gpu_shader_fp64.yml
+- lib/opengl/raw/core/4_0/GL_ARB_shader_subroutine.yml
+- lib/opengl/raw/core/4_0/GL_ARB_tessellation_shader.yml
+- lib/opengl/raw/core/4_0/GL_ARB_transform_feedback2.yml
+- lib/opengl/raw/core/4_0/GL_ARB_transform_feedback3.yml
+- lib/opengl/raw/core/4_0/GL_VERSION_4_0.yml
+- lib/opengl/raw/core/4_1/GL_ARB_ES2_compatibility.yml
+- lib/opengl/raw/core/4_1/GL_ARB_get_program_binary.yml
+- lib/opengl/raw/core/4_1/GL_ARB_separate_shader_objects.yml
+- lib/opengl/raw/core/4_1/GL_ARB_vertex_attrib_64bit.yml
+- lib/opengl/raw/core/4_1/GL_ARB_viewport_array.yml
+- lib/opengl/raw/core/4_1/GL_VERSION_4_1.yml
+- lib/opengl/raw/core/4_2/GL_ARB_base_instance.yml
+- lib/opengl/raw/core/4_2/GL_ARB_internalformat_query.yml
+- lib/opengl/raw/core/4_2/GL_ARB_shader_atomic_counters.yml
+- lib/opengl/raw/core/4_2/GL_ARB_shader_image_load_store.yml
+- lib/opengl/raw/core/4_2/GL_ARB_texture_storage.yml
+- lib/opengl/raw/core/4_2/GL_ARB_transform_feedback_instanced.yml
+- lib/opengl/raw/core/4_2/GL_VERSION_4_2.yml
+- lib/opengl/constants/ext/GL_EXT_texture_compression_s3tc.yml
+- lib/opengl/constants/ext/GL_EXT_texture_filter_anisotropic.yml
+- lib/opengl/constants/ext/GL_EXT_texture_sRGB.yml
 - lib/opengl/constants/core/2_x/GL_VERSION_1_1.yml
 - lib/opengl/constants/core/2_x/GL_VERSION_1_2.yml
 - lib/opengl/constants/core/2_x/GL_VERSION_1_3.yml
@@ -135,119 +248,8 @@ files:
 - lib/opengl/constants/core/4_3/GL_ARB_vertex_attrib_binding.yml
 - lib/opengl/constants/core/4_3/GL_KHR_debug.yml
 - lib/opengl/constants/core/4_3/GL_VERSION_4_3.yml
-- lib/opengl/constants/ext/GL_EXT_texture_compression_s3tc.yml
-- lib/opengl/constants/ext/GL_EXT_texture_filter_anisotropic.yml
-- lib/opengl/constants/ext/GL_EXT_texture_sRGB.yml
-- lib/opengl/constants.rb
-- lib/opengl/debugging.rb
-- lib/opengl/gl.rb
-- lib/opengl/platform/base.rb
-- lib/opengl/platform/darwin.rb
-- lib/opengl/platform/linux.rb
-- lib/opengl/platform/windows.rb
-- lib/opengl/platform.rb
-- lib/opengl/raw/core/2_x/GL_VERSION_1_0.yml
-- lib/opengl/raw/core/2_x/GL_VERSION_1_1.yml
-- lib/opengl/raw/core/2_x/GL_VERSION_1_2.yml
-- lib/opengl/raw/core/2_x/GL_VERSION_1_3.yml
-- lib/opengl/raw/core/2_x/GL_VERSION_1_4.yml
-- lib/opengl/raw/core/2_x/GL_VERSION_1_5.yml
-- lib/opengl/raw/core/2_x/GL_VERSION_2_0.yml
-- lib/opengl/raw/core/2_x/GL_VERSION_2_1.yml
-- lib/opengl/raw/core/3_0/GL_ARB_framebuffer_object.yml
-- lib/opengl/raw/core/3_0/GL_ARB_map_buffer_range.yml
-- lib/opengl/raw/core/3_0/GL_ARB_vertex_array_object.yml
-- lib/opengl/raw/core/3_0/GL_VERSION_3_0.yml
-- lib/opengl/raw/core/3_1/GL_ARB_copy_buffer.yml
-- lib/opengl/raw/core/3_1/GL_ARB_uniform_buffer_object.yml
-- lib/opengl/raw/core/3_1/GL_VERSION_3_1.yml
-- lib/opengl/raw/core/3_2/GL_ARB_draw_elements_base_vertex.yml
-- lib/opengl/raw/core/3_2/GL_ARB_provoking_vertex.yml
-- lib/opengl/raw/core/3_2/GL_ARB_sync.yml
-- lib/opengl/raw/core/3_2/GL_ARB_texture_multisample.yml
-- lib/opengl/raw/core/3_2/GL_VERSION_3_2.yml
-- lib/opengl/raw/core/3_3/GL_ARB_blend_func_extended.yml
-- lib/opengl/raw/core/3_3/GL_ARB_sampler_objects.yml
-- lib/opengl/raw/core/3_3/GL_ARB_timer_query.yml
-- lib/opengl/raw/core/3_3/GL_ARB_vertex_type_2_10_10_10_rev.yml
-- lib/opengl/raw/core/3_3/GL_VERSION_3_3.yml
-- lib/opengl/raw/core/4_0/GL_ARB_draw_indirect.yml
-- lib/opengl/raw/core/4_0/GL_ARB_gpu_shader_fp64.yml
-- lib/opengl/raw/core/4_0/GL_ARB_shader_subroutine.yml
-- lib/opengl/raw/core/4_0/GL_ARB_tessellation_shader.yml
-- lib/opengl/raw/core/4_0/GL_ARB_transform_feedback2.yml
-- lib/opengl/raw/core/4_0/GL_ARB_transform_feedback3.yml
-- lib/opengl/raw/core/4_0/GL_VERSION_4_0.yml
-- lib/opengl/raw/core/4_1/GL_ARB_ES2_compatibility.yml
-- lib/opengl/raw/core/4_1/GL_ARB_get_program_binary.yml
-- lib/opengl/raw/core/4_1/GL_ARB_separate_shader_objects.yml
-- lib/opengl/raw/core/4_1/GL_ARB_vertex_attrib_64bit.yml
-- lib/opengl/raw/core/4_1/GL_ARB_viewport_array.yml
-- lib/opengl/raw/core/4_1/GL_VERSION_4_1.yml
-- lib/opengl/raw/core/4_2/GL_ARB_base_instance.yml
-- lib/opengl/raw/core/4_2/GL_ARB_internalformat_query.yml
-- lib/opengl/raw/core/4_2/GL_ARB_shader_atomic_counters.yml
-- lib/opengl/raw/core/4_2/GL_ARB_shader_image_load_store.yml
-- lib/opengl/raw/core/4_2/GL_ARB_texture_storage.yml
-- lib/opengl/raw/core/4_2/GL_ARB_transform_feedback_instanced.yml
-- lib/opengl/raw/core/4_2/GL_VERSION_4_2.yml
-- lib/opengl/raw.rb
-- lib/opengl/type/default.yml
-- lib/opengl/type/i386-linux.yml
-- lib/opengl/type/i386-windows.yml
-- lib/opengl/type/x86_64-darwin.yml
-- lib/opengl/type/x86_64-linux.yml
-- lib/opengl/type/x86_64-windows.yml
-- lib/opengl/type.rb
-- lib/opengl/version.rb
-- lib/opengl/wrapper/base.rb
-- lib/opengl/wrapper/core/2_x/GL_VERSION_1_0.rb
-- lib/opengl/wrapper/core/2_x/GL_VERSION_1_1.rb
-- lib/opengl/wrapper/core/2_x/GL_VERSION_1_2.rb
-- lib/opengl/wrapper/core/2_x/GL_VERSION_1_3.rb
-- lib/opengl/wrapper/core/2_x/GL_VERSION_1_4.rb
-- lib/opengl/wrapper/core/2_x/GL_VERSION_1_5.rb
-- lib/opengl/wrapper/core/2_x/GL_VERSION_2_0.rb
-- lib/opengl/wrapper/core/2_x/GL_VERSION_2_1.rb
-- lib/opengl/wrapper/core/3_0/GL_ARB_framebuffer_object.rb
-- lib/opengl/wrapper/core/3_0/GL_ARB_map_buffer_range.rb
-- lib/opengl/wrapper/core/3_0/GL_ARB_vertex_array_object.rb
-- lib/opengl/wrapper/core/3_0/GL_VERSION_3_0.rb
-- lib/opengl/wrapper/core/3_1/GL_ARB_copy_buffer.rb
-- lib/opengl/wrapper/core/3_1/GL_ARB_uniform_buffer_object.rb
-- lib/opengl/wrapper/core/3_1/GL_VERSION_3_1.rb
-- lib/opengl/wrapper/core/3_2/GL_ARB_draw_elements_base_vertex.rb
-- lib/opengl/wrapper/core/3_2/GL_ARB_provoking_vertex.rb
-- lib/opengl/wrapper/core/3_2/GL_ARB_sync.rb
-- lib/opengl/wrapper/core/3_2/GL_ARB_texture_multisample.rb
-- lib/opengl/wrapper/core/3_2/GL_VERSION_3_2.rb
-- lib/opengl/wrapper/core/3_3/GL_ARB_blend_func_extended.rb
-- lib/opengl/wrapper/core/3_3/GL_ARB_sampler_objects.rb
-- lib/opengl/wrapper/core/3_3/GL_ARB_timer_query.rb
-- lib/opengl/wrapper/core/3_3/GL_ARB_vertex_type_2_10_10_10_rev.rb
-- lib/opengl/wrapper/core/3_3/GL_VERSION_3_3.rb
-- lib/opengl/wrapper/core/4_0/GL_ARB_draw_indirect.rb
-- lib/opengl/wrapper/core/4_0/GL_ARB_gpu_shader_fp64.rb
-- lib/opengl/wrapper/core/4_0/GL_ARB_shader_subroutine.rb
-- lib/opengl/wrapper/core/4_0/GL_ARB_tessellation_shader.rb
-- lib/opengl/wrapper/core/4_0/GL_ARB_transform_feedback2.rb
-- lib/opengl/wrapper/core/4_0/GL_ARB_transform_feedback3.rb
-- lib/opengl/wrapper/core/4_0/GL_VERSION_4_0.rb
-- lib/opengl/wrapper/core/4_1/GL_ARB_ES2_compatibility.rb
-- lib/opengl/wrapper/core/4_1/GL_ARB_get_program_binary.rb
-- lib/opengl/wrapper/core/4_1/GL_ARB_separate_shader_objects.rb
-- lib/opengl/wrapper/core/4_1/GL_ARB_vertex_attrib_64bit.rb
-- lib/opengl/wrapper/core/4_1/GL_ARB_viewport_array.rb
-- lib/opengl/wrapper/core/4_1/GL_VERSION_4_1.rb
-- lib/opengl/wrapper/core/4_2/GL_ARB_base_instance.rb
-- lib/opengl/wrapper/core/4_2/GL_ARB_internalformat_query.rb
-- lib/opengl/wrapper/core/4_2/GL_ARB_shader_atomic_counters.rb
-- lib/opengl/wrapper/core/4_2/GL_ARB_shader_image_load_store.rb
-- lib/opengl/wrapper/core/4_2/GL_ARB_texture_storage.rb
-- lib/opengl/wrapper/core/4_2/GL_ARB_transform_feedback_instanced.rb
-- lib/opengl/wrapper/core/4_2/GL_VERSION_4_2.rb
-- lib/opengl/wrapper.rb
-- lib/opengl.rb
+- lib/glut/i386/freeglut.dll.gitkeep
+- lib/glut/x86_64/freeglut.dll.gitkeep
 - README.md
 homepage: https://github.com/davll/ruby-opengl
 licenses: []
@@ -256,17 +258,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.9'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -274,4 +276,3 @@ signing_key:
 specification_version: 3
 summary: OpenGL
 test_files: []
-has_rdoc: