roglew 0.2.7 → 0.4.1

data/lib/roglew/extensions/GL_VERSION_1_5.rb

@@ -1,120 +1,135 @@
-module Roglew
-  module GL
-    ARRAY_BUFFER                         ||= 0x8892
-    ARRAY_BUFFER_BINDING                 ||= 0x8894
-    BUFFER_ACCESS                        ||= 0x88BB
-    BUFFER_MAP_POINTER                   ||= 0x88BD
-    BUFFER_MAPPED                        ||= 0x88BC
-    BUFFER_SIZE                          ||= 0x8764
-    BUFFER_USAGE                         ||= 0x8765
-    COLOR_ARRAY_BUFFER_BINDING           ||= 0x8898
-    CURRENT_FOG_COORD                    ||= CURRENT_FOG_COORDINATE
-    CURRENT_QUERY                        ||= 0x8865
-    DYNAMIC_COPY                         ||= 0x88EA
-    DYNAMIC_DRAW                         ||= 0x88E8
-    DYNAMIC_READ                         ||= 0x88E9
-    EDGE_FLAG_ARRAY_BUFFER_BINDING       ||= 0x889B
-    ELEMENT_ARRAY_BUFFER                 ||= 0x8893
-    ELEMENT_ARRAY_BUFFER_BINDING         ||= 0x8895
-    FOG_COORD                            ||= FOG_COORDINATE
-    FOG_COORD_ARRAY                      ||= FOG_COORDINATE_ARRAY
-    FOG_COORD_ARRAY_BUFFER_BINDING       ||= 0x889D
-    FOG_COORD_ARRAY_POINTER              ||= FOG_COORDINATE_ARRAY_POINTER
-    FOG_COORD_ARRAY_STRIDE               ||= FOG_COORDINATE_ARRAY_STRIDE
-    FOG_COORD_ARRAY_TYPE                 ||= FOG_COORDINATE_ARRAY_TYPE
-    FOG_COORD_SRC                        ||= FOG_COORDINATE_SOURCE
-    FOG_COORDINATE_ARRAY_BUFFER_BINDING  ||= FOG_COORD_ARRAY_BUFFER_BINDING
-    INDEX_ARRAY_BUFFER_BINDING           ||= 0x8899
-    NORMAL_ARRAY_BUFFER_BINDING          ||= 0x8897
-    QUERY_COUNTER_BITS                   ||= 0x8864
-    QUERY_RESULT                         ||= 0x8866
-    QUERY_RESULT_AVAILABLE               ||= 0x8867
-    READ_ONLY                            ||= 0x88B8
-    READ_WRITE                           ||= 0x88BA
-    SECONDARY_COLOR_ARRAY_BUFFER_BINDING ||= 0x889C
-    SRC0_ALPHA                           ||= SOURCE0_ALPHA
-    SRC0_RGB                             ||= SOURCE0_RGB
-    SRC1_ALPHA                           ||= SOURCE1_ALPHA
-    SRC1_RGB                             ||= SOURCE1_RGB
-    SRC2_ALPHA                           ||= SOURCE2_ALPHA
-    SRC2_RGB                             ||= SOURCE2_RGB
-    STATIC_COPY                          ||= 0x88E6
-    STATIC_DRAW                          ||= 0x88E4
-    STATIC_READ                          ||= 0x88E5
-    STREAM_COPY                          ||= 0x88E2
-    STREAM_DRAW                          ||= 0x88E0
-    STREAM_READ                          ||= 0x88E1
-    TEXTURE_COORD_ARRAY_BUFFER_BINDING   ||= 0x889A
-    VERTEX_ARRAY_BUFFER_BINDING          ||= 0x8896
-    VERTEX_ATTRIB_ARRAY_BUFFER_BINDING   ||= 0x889F
-    WEIGHT_ARRAY_BUFFER_BINDING          ||= 0x889E
-    WRITE_ONLY                           ||= 0x88B9
-  end
-end
-
-module GL_VERSION_1_5
-  module RenderContext
-    include Roglew::GLExtension
-
-    def create_buffer
-      Roglew::Buffer.new(self)
-    end
-
-    def create_query
-      Roglew::Query.new(context)
-    end
-
-    functions [:glBeginQuery, [ :uint, :uint ], :void],
-              [:glBindBuffer, [ :uint, :uint ], :void],
-              [:glBufferData, [ :uint, :size_t, :pointer, :uint ], :void],
-              [:glBufferSubData, [ :uint, :size_t, :size_t, :pointer ], :void],
-              [:glDeleteBuffers, [ :int, :pointer ], :void],
-              [:glDeleteQueries, [ :int, :pointer ], :void],
-              [:glEndQuery, [ :uint ], :void],
-              [:glGenBuffers, [ :int, :pointer ], :void],
-              [:glGenQueries, [ :int, :pointer ], :void],
-              [:glGetBufferParameteriv, [ :uint, :uint, :pointer ], :void],
-              [:glGetBufferPointerv, [ :uint, :uint, :pointer ], :void],
-              [:glGetBufferSubData, [ :uint, :size_t, :size_t, :pointer ], :void],
-              [:glGetQueryiv, [ :uint, :uint, :pointer ], :void],
-              [:glGetQueryObjectiv, [ :uint, :uint, :pointer ], :void],
-              [:glGetQueryObjectuiv, [ :uint, :uint, :pointer ], :void],
-              [:glIsBuffer, [ :uint ], :uchar],
-              [:glIsQuery, [ :uint ], :uchar],
-              [:glMapBuffer, [ :uint, :uint ], :pointer],
-              [:glUnmapBuffer, [ :uint ], :uchar]
-
-    def_object :Buffers
-    def_object :Queries
-
-    def buffer_data(target, usage, buffer = nil, type = nil)
-      glBufferData(target, *if buffer.is_a?(Array) && buffer.size > 0
-        p = FFI::MemoryPointer.new(type, buffer.size)
-        p.send("write_array_of_#{type}", buffer)
-        [p.size, p]
-      else
-        size = buffer.respond_to?(:to_i) ? buffer.to_i : 0
-        size *= if size > 0 && type
-          type = FFI.find_type(type) if type.is_a?(Symbol)
-          type.size
-        else
-          1
-        end
-
-        [size, nil]
-      end, usage)
-    end
-
-    def buffer_sub_data(target, offset, type, buffer)
-      pointer = FFI::MemoryPointer.new(type, buffer.size)
-      pointer.send("write_array_of_#{type}", buffer)
-      glBufferSubData(target, offset, buffer.size, pointer)
-    end
-  end
-end
-
-%w'
-buffer_context
-buffer
-query
+module Roglew
+  module GL
+    ARRAY_BUFFER                         ||= 0x8892
+    ARRAY_BUFFER_BINDING                 ||= 0x8894
+    BUFFER_ACCESS                        ||= 0x88BB
+    BUFFER_MAP_POINTER                   ||= 0x88BD
+    BUFFER_MAPPED                        ||= 0x88BC
+    BUFFER_SIZE                          ||= 0x8764
+    BUFFER_USAGE                         ||= 0x8765
+    COLOR_ARRAY_BUFFER_BINDING           ||= 0x8898
+    CURRENT_FOG_COORD                    ||= CURRENT_FOG_COORDINATE
+    CURRENT_QUERY                        ||= 0x8865
+    DYNAMIC_COPY                         ||= 0x88EA
+    DYNAMIC_DRAW                         ||= 0x88E8
+    DYNAMIC_READ                         ||= 0x88E9
+    EDGE_FLAG_ARRAY_BUFFER_BINDING       ||= 0x889B
+    ELEMENT_ARRAY_BUFFER                 ||= 0x8893
+    ELEMENT_ARRAY_BUFFER_BINDING         ||= 0x8895
+    FOG_COORD                            ||= FOG_COORDINATE
+    FOG_COORD_ARRAY                      ||= FOG_COORDINATE_ARRAY
+    FOG_COORD_ARRAY_BUFFER_BINDING       ||= 0x889D
+    FOG_COORD_ARRAY_POINTER              ||= FOG_COORDINATE_ARRAY_POINTER
+    FOG_COORD_ARRAY_STRIDE               ||= FOG_COORDINATE_ARRAY_STRIDE
+    FOG_COORD_ARRAY_TYPE                 ||= FOG_COORDINATE_ARRAY_TYPE
+    FOG_COORD_SRC                        ||= FOG_COORDINATE_SOURCE
+    FOG_COORDINATE_ARRAY_BUFFER_BINDING  ||= FOG_COORD_ARRAY_BUFFER_BINDING
+    INDEX_ARRAY_BUFFER_BINDING           ||= 0x8899
+    NORMAL_ARRAY_BUFFER_BINDING          ||= 0x8897
+    QUERY_COUNTER_BITS                   ||= 0x8864
+    QUERY_RESULT                         ||= 0x8866
+    QUERY_RESULT_AVAILABLE               ||= 0x8867
+    READ_ONLY                            ||= 0x88B8
+    READ_WRITE                           ||= 0x88BA
+    SECONDARY_COLOR_ARRAY_BUFFER_BINDING ||= 0x889C
+    SRC0_ALPHA                           ||= SOURCE0_ALPHA
+    SRC0_RGB                             ||= SOURCE0_RGB
+    SRC1_ALPHA                           ||= SOURCE1_ALPHA
+    SRC1_RGB                             ||= SOURCE1_RGB
+    SRC2_ALPHA                           ||= SOURCE2_ALPHA
+    SRC2_RGB                             ||= SOURCE2_RGB
+    STATIC_COPY                          ||= 0x88E6
+    STATIC_DRAW                          ||= 0x88E4
+    STATIC_READ                          ||= 0x88E5
+    STREAM_COPY                          ||= 0x88E2
+    STREAM_DRAW                          ||= 0x88E0
+    STREAM_READ                          ||= 0x88E1
+    TEXTURE_COORD_ARRAY_BUFFER_BINDING   ||= 0x889A
+    VERTEX_ARRAY_BUFFER_BINDING          ||= 0x8896
+    VERTEX_ATTRIB_ARRAY_BUFFER_BINDING   ||= 0x889F
+    WEIGHT_ARRAY_BUFFER_BINDING          ||= 0x889E
+    WRITE_ONLY                           ||= 0x88B9
+  end
+end
+
+module GL_VERSION_1_5
+  module RenderHandle
+    include Roglew::RenderHandleExtension
+
+    functions [
+        [:glBeginQuery, [ :uint, :uint ], :void],
+        [:glBindBuffer, [ :uint, :uint ], :void],
+        [:glBufferData, [ :uint, :size_t, :pointer, :uint ], :void],
+        [:glBufferSubData, [ :uint, :size_t, :size_t, :pointer ], :void],
+        [:glDeleteBuffers, [ :int, :pointer ], :void],
+        [:glDeleteQueries, [ :int, :pointer ], :void],
+        [:glEndQuery, [ :uint ], :void],
+        [:glGenBuffers, [ :int, :pointer ], :void],
+        [:glGenQueries, [ :int, :pointer ], :void],
+        [:glGetBufferParameteriv, [ :uint, :uint, :pointer ], :void],
+        [:glGetBufferPointerv, [ :uint, :uint, :pointer ], :void],
+        [:glGetBufferSubData, [ :uint, :size_t, :size_t, :pointer ], :void],
+        [:glGetQueryiv, [ :uint, :uint, :pointer ], :void],
+        [:glGetQueryObjectiv, [ :uint, :uint, :pointer ], :void],
+        [:glGetQueryObjectuiv, [ :uint, :uint, :pointer ], :void],
+        [:glIsBuffer, [ :uint ], :uchar],
+        [:glIsQuery, [ :uint ], :uchar],
+        [:glMapBuffer, [ :uint, :uint ], :pointer],
+        [:glUnmapBuffer, [ :uint ], :uchar]
+    ]
+
+    functions :compatibility, [
+        [ :glGetTexGendv, [ :uint, :uint, :pointer ], :void ]
+    ]
+  end
+
+  module RenderContext
+    include Roglew::RenderContextExtension
+
+    def_object :Buffers
+    def_object :Queries
+
+    checks_current
+    def create_buffer
+      Roglew::Buffer.new(@rh)
+    end
+
+    checks_current
+    def create_query
+      Roglew::Query.new(@rh)
+    end
+
+    checks_current
+    def buffer_data(target, usage, buffer = nil, type = nil)
+      size, pointer = if buffer.is_a?(Array) && buffer.size > 0
+                        p = FFI::MemoryPointer.new(type, buffer.size)
+                        p.send("write_array_of_#{type}", buffer)
+                        [p.size, p]
+                      else
+                        size = buffer.respond_to?(:to_i) ? buffer.to_i : 0
+                        size *= if size > 0 && type
+                                  type = FFI.find_type(type) if type.is_a?(Symbol)
+                                  type.size
+                                else
+                                  1
+                                end
+                        [size, nil]
+                      end
+
+      @rh.glBufferData(target, size, pointer, usage)
+    end
+
+    checks_current
+    def buffer_sub_data(target, offset, type, buffer)
+      pointer = FFI::MemoryPointer.new(type, buffer.size)
+      pointer.send("write_array_of_#{type}", buffer)
+      @rh.glBufferSubData(target, offset, buffer.size, pointer)
+    end
+  end
+end
+
+%w'
+  buffer_context
+  buffer
+  query
 '.each { |f| require "#{File.expand_path(__FILE__)[0..-4]}/#{f}" }

data/lib/roglew/extensions/GL_VERSION_1_5/buffer.rb

@@ -1,25 +1,25 @@
-module Roglew
-  class Buffer
-    include Roglew::Contextual(BufferContext)
-
-    attr_reader :context, :id
-
-    def initialize(context)
-      @context = context
-      @id = context.gen_buffers
-
-      ObjectSpace.define_finalizer(self, self.class.finalize(@context, @id))
-    end
-
-    def self.finalize(ctx, id)
-      proc do
-        puts "releasing buffer #{id}"
-        ctx.delete_buffers(id)
-      end
-    end
-
-    def bind(target, deferred = nil, &block)
-      create_binding(deferred, target, &block)
-    end
-  end
+module Roglew
+  class Buffer
+    include Roglew::Contextual(BufferContext)
+
+    attr_reader :handle, :id
+
+    def initialize(handle)
+      @handle = handle
+      @id = handle.bind { |context| context.gen_buffers }
+
+      ObjectSpace.define_finalizer(self, self.class.finalize(@handle, @id))
+    end
+
+    def self.finalize(handle, id)
+      proc do
+        #puts "releasing buffer #{id}"
+        handle.bind { |context| context.delete_buffers(id) }
+      end
+    end
+
+    def bind(target, deferred = nil, &block)
+      create_binding(deferred, target, &block)
+    end
+  end
 end

data/lib/roglew/extensions/GL_VERSION_1_5/buffer_context.rb

@@ -1,27 +1,33 @@
-module Roglew
-  class BufferContext
-    include Roglew::BaseContext(:buffer)
-
-    def initialize(buffer, deferred, target, &block)
-      @target = target
-      super(buffer, deferred, &block)
-    end
-
-    def data(usage, buffer = nil, type = nil)
-      make_call(:buffer_data, @target, usage, buffer, type)
-    end
-
-    def sub_data(offset, type, buffer)
-      make_call(:buffer_sub_data, @target, offset, type, buffer)
-    end
-
-    private
-    def bind
-      context.glBindBuffer(@target, buffer.id)
-    end
-
-    def unbind
-      context.glBindBuffer(@target, 0)
-    end
-  end
+module Roglew
+  class BufferContext
+    include Roglew::BaseContext(:buffer)
+
+    make_calls :handle, :glBindBuffer
+
+    make_calls :context,
+               :buffer_data,
+               :buffer_sub_data
+
+    def initialize(buffer, deferred, target, &block)
+      @target = target
+      super(buffer, deferred, &block)
+    end
+
+    def data(usage, buffer = nil, type = nil)
+      buffer_data(@target, usage, buffer, type)
+    end
+
+    def sub_data(offset, type, buffer)
+      buffer_sub_data(@target, offset, type, buffer)
+    end
+
+    private
+    def bind
+      glBindBuffer(@target, buffer.id)
+    end
+
+    def unbind
+      glBindBuffer(@target, 0)
+    end
+  end
 end

data/lib/roglew/extensions/GL_VERSION_1_5/query.rb

@@ -1,19 +1,19 @@
-module Roglew
-  class Query
-
-    attr_reader :context, :id
-
-    def initialize(context)
-      @context = context
-      @id = context.gen_queries
-      ObjectSpace.define_finalizer(self, self.class.finalize(@context, @id))
-    end
-
-    def self.finalize(ctx, id)
-      proc do
-        puts "releasing query #{id}"
-        ctx.delete_queries(id)
-      end
-    end
-  end
+module Roglew
+  class Query
+
+    attr_reader :handle, :id
+
+    def initialize(handle)
+      @handle = handle
+      @id = handle.bind { |context| context.gen_queries }
+      ObjectSpace.define_finalizer(self, self.class.finalize(@handle, @id))
+    end
+
+    def self.finalize(handle, id)
+      proc do
+        #puts "releasing query #{id}"
+        handle.bind { |context| context.delete_queries(id) }
+      end
+    end
+  end
 end

data/lib/roglew/extensions/GL_VERSION_2_0.rb

@@ -89,19 +89,122 @@ module Roglew
 end
 
 module GL_VERSION_2_0
+  module RenderHandle
+    include Roglew::RenderHandleExtension
+
+    functions	[
+        [ :glAttachShader, [:uint, :uint], :void ],
+        [ :glBindAttribLocation, [:uint, :uint, :string], :void ],
+        [ :glBlendEquationSeparate, [:uint, :uint], :void ],
+        [ :glCompileShader, [:uint], :void ],
+        [ :glCreateProgram, [], :uint ],
+        [ :glCreateShader, [:uint], :uint ],
+        [ :glDeleteProgram, [:uint], :void ],
+        [ :glDeleteShader, [:uint], :void ],
+        [ :glDetachShader, [:uint, :uint], :void ],
+        [ :glDisableVertexAttribArray, [:uint], :void ],
+        [ :glDrawBuffers, [:int, :pointer], :void ],
+        [ :glEnableVertexAttribArray, [:uint], :void ],
+        [ :glGetActiveAttrib, [:uint, :uint, :int, :pointer, :pointer, :pointer, :pointer], :void ],
+        [ :glGetActiveUniform, [:uint, :uint, :int, :pointer, :pointer, :pointer, :pointer], :void ],
+        [ :glGetAttachedShaders, [:uint, :int, :pointer, :pointer], :void ],
+        [ :glGetAttribLocation, [:uint, :string], :int ],
+        [ :glGetProgramInfoLog, [:uint, :int, :pointer, :pointer], :void ],
+        [ :glGetProgramiv, [:uint, :uint, :pointer], :void ],
+        [ :glGetShaderInfoLog, [:uint, :int, :pointer, :pointer], :void ],
+        [ :glGetShaderiv, [:uint, :uint, :pointer], :void ],
+        [ :glGetShaderSource, [:uint, :int, :pointer, :pointer], :void ],
+        [ :glGetUniformfv, [:uint, :int, :pointer], :void ],
+        [ :glGetUniformiv, [:uint, :int, :pointer], :void ],
+        [ :glGetUniformLocation, [:uint, :string], :int ],
+        [ :glGetVertexAttribdv, [:uint, :uint, :pointer], :void ],
+        [ :glGetVertexAttribfv, [:uint, :uint, :pointer], :void ],
+        [ :glGetVertexAttribiv, [:uint, :uint, :pointer], :void ],
+        [ :glGetVertexAttribPointerv, [:uint, :uint, :pointer], :void ],
+        [ :glIsProgram, [:uint], :bool ],
+        [ :glIsShader, [:uint], :bool ],
+        [ :glLinkProgram, [:uint], :void ],
+        [ :glShaderSource, [:uint, :int, :pointer, :pointer], :void ],
+        [ :glStencilFuncSeparate, [:uint, :uint, :int, :uint], :void ],
+        [ :glStencilMaskSeparate, [:uint, :uint], :void ],
+        [ :glStencilOpSeparate, [:uint, :uint, :uint, :uint], :void ],
+        [ :glUniform1f, [:int, :float], :void ],
+        [ :glUniform1fv, [:int, :int, :pointer], :void ],
+        [ :glUniform1i, [:int, :int], :void ],
+        [ :glUniform1iv, [:int, :int, :pointer], :void ],
+        [ :glUniform2f, [:int, :float, :float], :void ],
+        [ :glUniform2fv, [:int, :int, :pointer], :void ],
+        [ :glUniform2i, [:int, :int, :int], :void ],
+        [ :glUniform2iv, [:int, :int, :pointer], :void ],
+        [ :glUniform3f, [:int, :float, :float, :float], :void ],
+        [ :glUniform3fv, [:int, :int, :pointer], :void ],
+        [ :glUniform3i, [:int, :int, :int, :int], :void ],
+        [ :glUniform3iv, [:int, :int, :pointer], :void ],
+        [ :glUniform4f, [:int, :float, :float, :float, :float], :void ],
+        [ :glUniform4fv, [:int, :int, :pointer], :void ],
+        [ :glUniform4i, [:int, :int, :int, :int, :int], :void ],
+        [ :glUniform4iv, [:int, :int, :pointer], :void ],
+        [ :glUniformMatrix2fv, [:int, :int, :bool, :pointer], :void ],
+        [ :glUniformMatrix3fv, [:int, :int, :bool, :pointer], :void ],
+        [ :glUniformMatrix4fv, [:int, :int, :bool, :pointer], :void ],
+        [ :glUseProgram, [:uint], :void ],
+        [ :glValidateProgram, [:uint], :void ],
+        [ :glVertexAttrib1d, [:uint, :double], :void ],
+        [ :glVertexAttrib1dv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib1f, [:uint, :float], :void ],
+        [ :glVertexAttrib1fv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib1s, [:uint, :short], :void ],
+        [ :glVertexAttrib1sv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib2d, [:uint, :double, :double], :void ],
+        [ :glVertexAttrib2dv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib2f, [:uint, :float, :float], :void ],
+        [ :glVertexAttrib2fv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib2s, [:uint, :short, :short], :void ],
+        [ :glVertexAttrib2sv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib3d, [:uint, :double, :double, :double], :void ],
+        [ :glVertexAttrib3dv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib3f, [:uint, :float, :float, :float], :void ],
+        [ :glVertexAttrib3fv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib3s, [:uint, :short, :short, :short], :void ],
+        [ :glVertexAttrib3sv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4bv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4d, [:uint, :double, :double, :double, :double], :void ],
+        [ :glVertexAttrib4dv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4f, [:uint, :float, :float, :float, :float], :void ],
+        [ :glVertexAttrib4fv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4iv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4Nbv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4Niv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4Nsv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4Nub, [:uint, :uchar, :uchar, :uchar, :uchar], :void ],
+        [ :glVertexAttrib4Nubv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4Nuiv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4Nusv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4s, [:uint, :short, :short, :short, :short], :void ],
+        [ :glVertexAttrib4sv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4ubv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4uiv, [:uint, :pointer], :void ],
+        [ :glVertexAttrib4usv, [:uint, :pointer], :void ],
+        [ :glVertexAttribPointer, [:uint, :int, :uint, :bool, :int, :size_t], :void]
+    ]
+  end
+
   module RenderContext
-    include Roglew::GLExtension
+    include Roglew::RenderContextExtension
 
     def create_program(shaders = nil)
-      program = Roglew::ShaderProgram.new(self)
+      program = Roglew::ShaderProgram.new(@rh)
       return program unless shaders
       shaders = case shaders
-      when Hash
-        shaders.map { |type, source| create_shader(type, source) }
-      when Array
-        shaders
-      else
-        raise ArgumentError, "It must be Hash or Array. Given: #{shaders.class}"
+        when Hash
+          shaders.map do |type, source|
+            type = type.is_a?(Integer) ? type : Roglew::GL.const_get("#{type.to_s.upcase}_SHADER")
+            create_shader(type, source)
+          end
+        when Array
+          shaders
+        else
+          raise ArgumentError, "It must be Hash or Array. Given: #{shaders.class}"
       end
       program.attach(*shaders)
       program.link
@@ -109,106 +212,12 @@ module GL_VERSION_2_0
     end
 
     def create_shader(*args)
-      Roglew::Shader.new(self, *args)
+      Roglew::Shader.new(@rh, *args)
     end
 
-    functions	[:glAttachShader,             [:uint, :uint],                                               :void],
-              [:glBindAttribLocation,       [:uint, :uint, :string],                                      :void],
-              [:glBlendEquationSeparate,    [:uint, :uint],                                               :void],
-              [:glCompileShader,            [:uint],                                                      :void],
-              [:glCreateProgram,            [],                                                           :uint],
-              [:glCreateShader,             [:uint],                                                      :uint],
-              [:glDeleteProgram,            [:uint],                                                      :void],
-              [:glDeleteShader,             [:uint],                                                      :void],
-              [:glDetachShader,             [:uint, :uint],                                               :void],
-              [:glDisableVertexAttribArray, [:uint],                                                      :void],
-              [:glDrawBuffers,              [:int, :pointer],                                             :void],
-              [:glEnableVertexAttribArray,  [:uint],                                                      :void],
-              [:glGetActiveAttrib,          [:uint, :uint, :int, :pointer, :pointer, :pointer, :pointer], :void],
-              [:glGetActiveUniform,         [:uint, :uint, :int, :pointer, :pointer, :pointer, :pointer], :void],
-              [:glGetAttachedShaders,       [:uint, :int, :pointer, :pointer],                            :void],
-              [:glGetAttribLocation,        [:uint, :string],                                             :int],
-              [:glGetProgramInfoLog,        [:uint, :int, :pointer, :pointer],                            :void],
-              [:glGetProgramiv,             [:uint, :uint, :pointer],                                     :void],
-              [:glGetShaderInfoLog,         [:uint, :int, :pointer, :pointer],                            :void],
-              [:glGetShaderiv,              [:uint, :uint, :pointer],                                     :void],
-              [:glGetShaderSource,          [:uint, :int, :pointer, :pointer],                            :void],
-              [:glGetUniformfv,             [:uint, :int, :pointer],                                      :void],
-              [:glGetUniformiv,             [:uint, :int, :pointer],                                      :void],
-              [:glGetUniformLocation,       [:uint, :string],                                             :int],
-              [:glGetVertexAttribdv,        [:uint, :uint, :pointer],                                     :void],
-              [:glGetVertexAttribfv,        [:uint, :uint, :pointer],                                     :void],
-              [:glGetVertexAttribiv,        [:uint, :uint, :pointer],                                     :void],
-              [:glGetVertexAttribPointerv,  [:uint, :uint, :pointer],                                     :void],
-              [:glIsProgram,                [:uint],                                                      :bool],
-              [:glIsShader,                 [:uint],                                                      :bool],
-              [:glLinkProgram,              [:uint],                                                      :void],
-              [:glShaderSource,             [:uint, :int, :pointer, :pointer],                            :void],
-              [:glStencilFuncSeparate,      [:uint, :uint, :int, :uint],                                  :void],
-              [:glStencilMaskSeparate,      [:uint, :uint],                                               :void],
-              [:glStencilOpSeparate,        [:uint, :uint, :uint, :uint],                                 :void],
-              [:glUniform1f,                [:int, :float],                                               :void],
-              [:glUniform1fv,               [:int, :int, :pointer],                                       :void],
-              [:glUniform1i,                [:int, :int],                                                 :void],
-              [:glUniform1iv,               [:int, :int, :pointer],                                       :void],
-              [:glUniform2f,                [:int, :float, :float],                                       :void],
-              [:glUniform2fv,               [:int, :int, :pointer],                                       :void],
-              [:glUniform2i,                [:int, :int, :int],                                           :void],
-              [:glUniform2iv,               [:int, :int, :pointer],                                       :void],
-              [:glUniform3f,                [:int, :float, :float, :float],                               :void],
-              [:glUniform3fv,               [:int, :int, :pointer],                                       :void],
-              [:glUniform3i,                [:int, :int, :int, :int],                                     :void],
-              [:glUniform3iv,               [:int, :int, :pointer],                                       :void],
-              [:glUniform4f,                [:int, :float, :float, :float, :float],                       :void],
-              [:glUniform4fv,               [:int, :int, :pointer],                                       :void],
-              [:glUniform4i,                [:int, :int, :int, :int, :int],                               :void],
-              [:glUniform4iv,               [:int, :int, :pointer],                                       :void],
-              [:glUniformMatrix2fv,         [:int, :int, :bool, :pointer],                                :void],
-              [:glUniformMatrix3fv,         [:int, :int, :bool, :pointer],                                :void],
-              [:glUniformMatrix4fv,         [:int, :int, :bool, :pointer],                                :void],
-              [:glUseProgram,               [:uint],                                                      :void],
-              [:glValidateProgram,          [:uint],                                                      :void],
-              [:glVertexAttrib1d,           [:uint, :double],                                             :void],
-              [:glVertexAttrib1dv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib1f,           [:uint, :float],                                              :void],
-              [:glVertexAttrib1fv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib1s,           [:uint, :short],                                              :void],
-              [:glVertexAttrib1sv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib2d,           [:uint, :double, :double],                                    :void],
-              [:glVertexAttrib2dv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib2f,           [:uint, :float, :float],                                      :void],
-              [:glVertexAttrib2fv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib2s,           [:uint, :short, :short],                                      :void],
-              [:glVertexAttrib2sv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib3d,           [:uint, :double, :double, :double],                           :void],
-              [:glVertexAttrib3dv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib3f,           [:uint, :float, :float, :float],                              :void],
-              [:glVertexAttrib3fv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib3s,           [:uint, :short, :short, :short],                              :void],
-              [:glVertexAttrib3sv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4bv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4d,           [:uint, :double, :double, :double, :double],                  :void],
-              [:glVertexAttrib4dv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4f,           [:uint, :float, :float, :float, :float],                      :void],
-              [:glVertexAttrib4fv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4iv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4Nbv,         [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4Niv,         [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4Nsv,         [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4Nub,         [:uint, :uchar, :uchar, :uchar, :uchar],                      :void],
-              [:glVertexAttrib4Nubv,        [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4Nuiv,        [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4Nusv,        [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4s,           [:uint, :short, :short, :short, :short],                      :void],
-              [:glVertexAttrib4sv,          [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4ubv,         [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4uiv,         [:uint, :pointer],                                            :void],
-              [:glVertexAttrib4usv,         [:uint, :pointer],                                            :void],
-              [:glVertexAttribPointer,      [:uint, :int, :uint, :bool, :int, :size_t],                   :void]
-
     def get_program(program, pname)
       p = FFI::MemoryPointer.new(:int)
-      glGetProgramiv(program, pname, p)
+      @rh.glGetProgramiv(program, pname, p)
       result = p.read_int
       [Roglew::GL::DELETE_STATUS, Roglew::GL::COMPILE_STATUS].include?(pname) ? result == Roglew::GL::TRUE : result
     end
@@ -216,13 +225,13 @@ module GL_VERSION_2_0
     def get_program_info_log(program)
       length = get_program(program, Roglew::GL::INFO_LOG_LENGTH)
       p = FFI::MemoryPointer.new(:char, length)
-      glGetProgramInfoLog(program, length, nil, p)
+      @rh.glGetProgramInfoLog(program, length, nil, p)
       p.read_string
     end
 
     def get_shader(shader, pname)
       p = FFI::MemoryPointer.new(:int)
-      glGetShaderiv(shader, pname, p)
+      @rh.glGetShaderiv(shader, pname, p)
       result = p.read_int
       [Roglew::GL::DELETE_STATUS, Roglew::GL::COMPILE_STATUS].include?(pname) ? result == Roglew::GL::TRUE : result
     end
@@ -230,7 +239,7 @@ module GL_VERSION_2_0
     def get_shader_info_log(shader)
       length = get_shader(shader, Roglew::GL::INFO_LOG_LENGTH)
       p = FFI::MemoryPointer.new(:char, length)
-      glGetShaderInfoLog(shader, length, nil, p)
+      @rh.glGetShaderInfoLog(shader, length, nil, p)
       p.read_string
     end
 
@@ -239,11 +248,17 @@ module GL_VERSION_2_0
       ps.write_array_of_pointer(srcs.map { |src| FFI::MemoryPointer.from_string(src) })
       pl = FFI::MemoryPointer.new(:int, srcs.length)
       pl.write_array_of_int(srcs.map { |src| src.length })
-      glShaderSource(shader, srcs.length, ps, pl)
+      @rh.glShaderSource(shader, srcs.length, ps, pl)
+    end
+
+    private
+    def map_type(type)
+
     end
   end
 end
 
-%w'shader
-shader_program
+%w'
+  shader
+  shader_program
 '.each { |f| require "#{File.expand_path(__FILE__)[0..-4]}/#{f}" }