roglew 0.2.7 → 0.4.1

data/lib/roglew/extensions/GL_EXT_draw_buffers2.rb

@@ -1,12 +1,14 @@
-module GL_EXT_draw_buffers2
-  module RenderContext
-    include Roglew::GLExtension
-
-    functions [:glColorMaskIndexedEXT, [ :uint, :uchar, :uchar, :uchar, :uchar ], :void],
-              [:glDisableIndexedEXT, [ :uint, :uint ], :void],
-              [:glEnableIndexedEXT, [ :uint, :uint ], :void],
-              [:glGetBooleanIndexedvEXT, [ :uint, :uint, :pointer ], :void],
-              [:glGetIntegerIndexedvEXT, [ :uint, :uint, :pointer ], :void],
-              [:glIsEnabledIndexedEXT, [ :uint, :uint ], :uchar]
-  end
+module GL_EXT_draw_buffers2
+  module RenderHandle
+    include Roglew::RenderHandleExtension
+
+    functions [
+        [:glColorMaskIndexedEXT, [ :uint, :uchar, :uchar, :uchar, :uchar ], :void],
+        [:glDisableIndexedEXT, [ :uint, :uint ], :void],
+        [:glEnableIndexedEXT, [ :uint, :uint ], :void],
+        [:glGetBooleanIndexedvEXT, [ :uint, :uint, :pointer ], :void],
+        [:glGetIntegerIndexedvEXT, [ :uint, :uint, :pointer ], :void],
+        [:glIsEnabledIndexedEXT, [ :uint, :uint ], :uchar]
+    ]
+  end
 end

data/lib/roglew/extensions/GL_EXT_draw_instanced.rb

@@ -1,8 +1,10 @@
-module GL_EXT_draw_instanced
-  module RenderContext
-    include Roglew::GLExtension
-
-    functions [:glDrawArraysInstancedEXT, [ :uint, :int, :int, :int ], :void],
-              [:glDrawElementsInstancedEXT, [ :uint, :int, :uint, :pointer, :int ], :void]
-  end
+module GL_EXT_draw_instanced
+  module RenderHandle
+    include Roglew::RenderHandleExtension
+
+    functions [
+        [:glDrawArraysInstancedEXT, [ :uint, :int, :int, :int ], :void],
+        [:glDrawElementsInstancedEXT, [ :uint, :int, :uint, :pointer, :int ], :void]
+    ]
+  end
 end

data/lib/roglew/extensions/GL_EXT_draw_range_elements.rb

@@ -1,15 +1,17 @@
-module Roglew
-  module GL
-    MAX_ELEMENTS_INDICES_EXT  ||= 0x80E9
-    MAX_ELEMENTS_VERTICES_EXT ||= 0x80E8
-  end
-end
-
-module GL_EXT_draw_range_elements
-  module RenderContext
-    include Roglew::GLExtension
-
-    functions [:glDrawRangeElementsEXT, [ :uint, :uint, :uint, :int, :uint, :pointer ], :void]
-  end
-end
-
+module Roglew
+  module GL
+    MAX_ELEMENTS_INDICES_EXT  ||= 0x80E9
+    MAX_ELEMENTS_VERTICES_EXT ||= 0x80E8
+  end
+end
+
+module GL_EXT_draw_range_elements
+  module RenderHandle
+    include Roglew::RenderHandleExtension
+
+    functions [
+        [:glDrawRangeElementsEXT, [ :uint, :uint, :uint, :int, :uint, :pointer ], :void]
+    ]
+  end
+end
+

data/lib/roglew/extensions/GL_EXT_fog_coord.rb

@@ -1,24 +1,26 @@
-module Roglew
-  module GL
-    CURRENT_FOG_COORDINATE_EXT       ||= 0x8453
-    FOG_COORDINATE_ARRAY_EXT         ||= 0x8457
-    FOG_COORDINATE_ARRAY_POINTER_EXT ||= 0x8456
-    FOG_COORDINATE_ARRAY_STRIDE_EXT  ||= 0x8455
-    FOG_COORDINATE_ARRAY_TYPE_EXT    ||= 0x8454
-    FOG_COORDINATE_EXT               ||= 0x8451
-    FOG_COORDINATE_SOURCE_EXT        ||= 0x8450
-    FRAGMENT_DEPTH_EXT               ||= 0x8452
-  end
-end
-
-module GL_EXT_fog_coord
-  module RenderContext
-    include Roglew::GLExtension
-
-    functions [:glFogCoorddEXT, [ :double ], :void],
-              [:glFogCoorddvEXT, [ :pointer ], :void],
-              [:glFogCoordfEXT, [ :float ], :void],
-              [:glFogCoordfvEXT, [ :pointer ], :void]
-  end
-end
-
+module Roglew
+  module GL
+    CURRENT_FOG_COORDINATE_EXT       ||= 0x8453
+    FOG_COORDINATE_ARRAY_EXT         ||= 0x8457
+    FOG_COORDINATE_ARRAY_POINTER_EXT ||= 0x8456
+    FOG_COORDINATE_ARRAY_STRIDE_EXT  ||= 0x8455
+    FOG_COORDINATE_ARRAY_TYPE_EXT    ||= 0x8454
+    FOG_COORDINATE_EXT               ||= 0x8451
+    FOG_COORDINATE_SOURCE_EXT        ||= 0x8450
+    FRAGMENT_DEPTH_EXT               ||= 0x8452
+  end
+end
+
+module GL_EXT_fog_coord
+  module RenderHandle
+    include Roglew::RenderHandleExtension
+
+    functions [
+        [:glFogCoorddEXT, [ :double ], :void],
+        [:glFogCoorddvEXT, [ :pointer ], :void],
+        [:glFogCoordfEXT, [ :float ], :void],
+        [:glFogCoordfvEXT, [ :pointer ], :void]
+    ]
+  end
+end
+

data/lib/roglew/extensions/GL_EXT_fragment_lighting.rb

@@ -1,44 +1,46 @@
-module Roglew
-  module GL
-    CURRENT_RASTER_NORMAL_EXT                     ||= 0x8406
-    FRAGMENT_COLOR_MATERIAL_EXT                   ||= 0x8401
-    FRAGMENT_COLOR_MATERIAL_FACE_EXT              ||= 0x8402
-    FRAGMENT_COLOR_MATERIAL_PARAMETER_EXT         ||= 0x8403
-    FRAGMENT_LIGHT_MODEL_AMBIENT_EXT              ||= 0x840A
-    FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_EXT         ||= 0x8408
-    FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_EXT ||= 0x840B
-    FRAGMENT_LIGHT_MODEL_TWO_SIDE_EXT             ||= 0x8409
-    FRAGMENT_LIGHT0_EXT                           ||= 0x840C
-    FRAGMENT_LIGHT7_EXT                           ||= 0x8413
-    FRAGMENT_LIGHTING_EXT                         ||= 0x8400
-    LIGHT_ENV_MODE_EXT                            ||= 0x8407
-    MAX_ACTIVE_LIGHTS_EXT                         ||= 0x8405
-    MAX_FRAGMENT_LIGHTS_EXT                       ||= 0x8404
-  end
-end
-
-module GL_EXT_fragment_lighting
-  module RenderContext
-    include Roglew::GLExtension
-
-    functions [:glFragmentColorMaterialEXT, [ :uint, :uint ], :void],
-              [:glFragmentLightfEXT, [ :uint, :uint, :float ], :void],
-              [:glFragmentLightfvEXT, [ :uint, :uint, :pointer ], :void],
-              [:glFragmentLightiEXT, [ :uint, :uint, :int ], :void],
-              [:glFragmentLightivEXT, [ :uint, :uint, :pointer ], :void],
-              [:glFragmentLightModelfEXT, [ :uint, :float ], :void],
-              [:glFragmentLightModelfvEXT, [ :uint, :pointer ], :void],
-              [:glFragmentLightModeliEXT, [ :uint, :int ], :void],
-              [:glFragmentLightModelivEXT, [ :uint, :pointer ], :void],
-              [:glFragmentMaterialfEXT, [ :uint, :uint, :float ], :void],
-              [:glFragmentMaterialfvEXT, [ :uint, :uint, :pointer ], :void],
-              [:glFragmentMaterialiEXT, [ :uint, :uint, :int ], :void],
-              [:glFragmentMaterialivEXT, [ :uint, :uint, :pointer ], :void],
-              [:glGetFragmentLightfvEXT, [ :uint, :uint, :pointer ], :void],
-              [:glGetFragmentLightivEXT, [ :uint, :uint, :pointer ], :void],
-              [:glGetFragmentMaterialfvEXT, [ :uint, :uint, :pointer ], :void],
-              [:glGetFragmentMaterialivEXT, [ :uint, :uint, :pointer ], :void],
-              [:glLightEnviEXT, [ :uint, :int ], :void]
-  end
-end
-
+module Roglew
+  module GL
+    CURRENT_RASTER_NORMAL_EXT                     ||= 0x8406
+    FRAGMENT_COLOR_MATERIAL_EXT                   ||= 0x8401
+    FRAGMENT_COLOR_MATERIAL_FACE_EXT              ||= 0x8402
+    FRAGMENT_COLOR_MATERIAL_PARAMETER_EXT         ||= 0x8403
+    FRAGMENT_LIGHT_MODEL_AMBIENT_EXT              ||= 0x840A
+    FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_EXT         ||= 0x8408
+    FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_EXT ||= 0x840B
+    FRAGMENT_LIGHT_MODEL_TWO_SIDE_EXT             ||= 0x8409
+    FRAGMENT_LIGHT0_EXT                           ||= 0x840C
+    FRAGMENT_LIGHT7_EXT                           ||= 0x8413
+    FRAGMENT_LIGHTING_EXT                         ||= 0x8400
+    LIGHT_ENV_MODE_EXT                            ||= 0x8407
+    MAX_ACTIVE_LIGHTS_EXT                         ||= 0x8405
+    MAX_FRAGMENT_LIGHTS_EXT                       ||= 0x8404
+  end
+end
+
+module GL_EXT_fragment_lighting
+  module RenderHandle
+    include Roglew::RenderHandleExtension
+
+    functions [
+        [:glFragmentColorMaterialEXT, [ :uint, :uint ], :void],
+        [:glFragmentLightfEXT, [ :uint, :uint, :float ], :void],
+        [:glFragmentLightfvEXT, [ :uint, :uint, :pointer ], :void],
+        [:glFragmentLightiEXT, [ :uint, :uint, :int ], :void],
+        [:glFragmentLightivEXT, [ :uint, :uint, :pointer ], :void],
+        [:glFragmentLightModelfEXT, [ :uint, :float ], :void],
+        [:glFragmentLightModelfvEXT, [ :uint, :pointer ], :void],
+        [:glFragmentLightModeliEXT, [ :uint, :int ], :void],
+        [:glFragmentLightModelivEXT, [ :uint, :pointer ], :void],
+        [:glFragmentMaterialfEXT, [ :uint, :uint, :float ], :void],
+        [:glFragmentMaterialfvEXT, [ :uint, :uint, :pointer ], :void],
+        [:glFragmentMaterialiEXT, [ :uint, :uint, :int ], :void],
+        [:glFragmentMaterialivEXT, [ :uint, :uint, :pointer ], :void],
+        [:glGetFragmentLightfvEXT, [ :uint, :uint, :pointer ], :void],
+        [:glGetFragmentLightivEXT, [ :uint, :uint, :pointer ], :void],
+        [:glGetFragmentMaterialfvEXT, [ :uint, :uint, :pointer ], :void],
+        [:glGetFragmentMaterialivEXT, [ :uint, :uint, :pointer ], :void],
+        [:glLightEnviEXT, [ :uint, :int ], :void]
+    ]
+  end
+end
+

data/lib/roglew/extensions/GL_EXT_framebuffer_blit.rb

@@ -1,17 +1,19 @@
-module Roglew
-  module GL
-    DRAW_FRAMEBUFFER_BINDING_EXT ||= 0x8CA6
-    DRAW_FRAMEBUFFER_EXT         ||= 0x8CA9
-    READ_FRAMEBUFFER_BINDING_EXT ||= 0x8CAA
-    READ_FRAMEBUFFER_EXT         ||= 0x8CA8
-  end
-end
-
-module GL_EXT_framebuffer_blit
-  module RenderContext
-    include Roglew::GLExtension
-
-    functions [:glBlitFramebufferEXT, [ :int, :int, :int, :int, :int, :int, :int, :int, :uint, :uint ], :void]
-  end
-end
-
+module Roglew
+  module GL
+    DRAW_FRAMEBUFFER_BINDING_EXT ||= 0x8CA6
+    DRAW_FRAMEBUFFER_EXT         ||= 0x8CA9
+    READ_FRAMEBUFFER_BINDING_EXT ||= 0x8CAA
+    READ_FRAMEBUFFER_EXT         ||= 0x8CA8
+  end
+end
+
+module GL_EXT_framebuffer_blit
+  module RenderHandle
+    include Roglew::RenderHandleExtension
+
+    functions [
+        [:glBlitFramebufferEXT, [ :int, :int, :int, :int, :int, :int, :int, :int, :uint, :uint ], :void]
+    ]
+  end
+end
+

data/lib/roglew/extensions/GL_EXT_framebuffer_multisample.rb

@@ -1,16 +1,18 @@
-module Roglew
-  module GL
-    FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT ||= 0x8D56
-    MAX_SAMPLES_EXT                        ||= 0x8D57
-    RENDERBUFFER_SAMPLES_EXT               ||= 0x8CAB
-  end
-end
-
-module GL_EXT_framebuffer_multisample
-  module RenderContext
-    include Roglew::GLExtension
-
-    functions [:glRenderbufferStorageMultisampleEXT, [ :uint, :int, :uint, :int, :int ], :void]
-  end
-end
-
+module Roglew
+  module GL
+    FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT ||= 0x8D56
+    MAX_SAMPLES_EXT                        ||= 0x8D57
+    RENDERBUFFER_SAMPLES_EXT               ||= 0x8CAB
+  end
+end
+
+module GL_EXT_framebuffer_multisample
+  module RenderHandle
+    include Roglew::RenderHandleExtension
+
+    functions [
+        [:glRenderbufferStorageMultisampleEXT, [ :uint, :int, :uint, :int, :int ], :void]
+    ]
+  end
+end
+

data/lib/roglew/extensions/GL_EXT_framebuffer_multisample_blit_scaled.rb

@@ -1,6 +1,6 @@
-module Roglew
-  module GL
-    SCALED_RESOLVE_FASTEST_EXT ||= 0x90BA
-    SCALED_RESOLVE_NICEST_EXT  ||= 0x90BB
-  end
+module Roglew
+  module GL
+    SCALED_RESOLVE_FASTEST_EXT ||= 0x90BA
+    SCALED_RESOLVE_NICEST_EXT  ||= 0x90BB
+  end
 end

data/lib/roglew/extensions/GL_EXT_framebuffer_object.rb

@@ -53,34 +53,43 @@ module Roglew
     RENDERBUFFER_STENCIL_SIZE_EXT                    ||= 0x8D55
   end
 
-  class TextureContext
+  #TODO refactor this to only exist by using RenderContext#create_texture2d
+  class Texture2dContext
+    make_calls :glGenerateMipmapEXT
+
     def generate_mipmapEXT
-      make_call(:glGenerateMipmapEXT, @target)
+      glGenerateMipmapEXT(@target)
     end
   end
 end
 
 module GL_EXT_framebuffer_object
-  module RenderContext
-    include Roglew::GLExtension
+  module RenderHandle
+    include Roglew::RenderHandleExtension
 
-    functions [:glBindFramebufferEXT, [ :uint, :uint ], :void],
-              [:glBindRenderbufferEXT, [ :uint, :uint ], :void],
-              [:glCheckFramebufferStatusEXT, [ :uint ], :uint],
-              [:glDeleteFramebuffersEXT, [ :int, :pointer ], :void],
-              [:glDeleteRenderbuffersEXT, [ :int, :pointer ], :void],
-              [:glFramebufferRenderbufferEXT, [ :uint, :uint, :uint, :uint ], :void],
-              [:glFramebufferTexture1DEXT, [ :uint, :uint, :uint, :uint, :int ], :void],
-              [:glFramebufferTexture2DEXT, [ :uint, :uint, :uint, :uint, :int ], :void],
-              [:glFramebufferTexture3DEXT, [ :uint, :uint, :uint, :uint, :int, :int ], :void],
-              [:glGenerateMipmapEXT, [ :uint ], :void],
-              [:glGenFramebuffersEXT, [ :int, :pointer ], :void],
-              [:glGenRenderbuffersEXT, [ :int, :pointer ], :void],
-              [:glGetFramebufferAttachmentParameterivEXT, [ :uint, :uint, :uint, :pointer ], :void],
-              [:glGetRenderbufferParameterivEXT, [ :uint, :uint, :pointer ], :void],
-              [:glIsFramebufferEXT, [ :uint ], :uchar],
-              [:glIsRenderbufferEXT, [ :uint ], :uchar],
-              [:glRenderbufferStorageEXT, [ :uint, :uint, :int, :int ], :void]
+    functions [
+        [:glBindFramebufferEXT, [ :uint, :uint ], :void],
+        [:glBindRenderbufferEXT, [ :uint, :uint ], :void],
+        [:glCheckFramebufferStatusEXT, [ :uint ], :uint],
+        [:glDeleteFramebuffersEXT, [ :int, :pointer ], :void],
+        [:glDeleteRenderbuffersEXT, [ :int, :pointer ], :void],
+        [:glFramebufferRenderbufferEXT, [ :uint, :uint, :uint, :uint ], :void],
+        [:glFramebufferTexture1DEXT, [ :uint, :uint, :uint, :uint, :int ], :void],
+        [:glFramebufferTexture2DEXT, [ :uint, :uint, :uint, :uint, :int ], :void],
+        [:glFramebufferTexture3DEXT, [ :uint, :uint, :uint, :uint, :int, :int ], :void],
+        [:glGenerateMipmapEXT, [ :uint ], :void],
+        [:glGenFramebuffersEXT, [ :int, :pointer ], :void],
+        [:glGenRenderbuffersEXT, [ :int, :pointer ], :void],
+        [:glGetFramebufferAttachmentParameterivEXT, [ :uint, :uint, :uint, :pointer ], :void],
+        [:glGetRenderbufferParameterivEXT, [ :uint, :uint, :pointer ], :void],
+        [:glIsFramebufferEXT, [ :uint ], :uchar],
+        [:glIsRenderbufferEXT, [ :uint ], :uchar],
+        [:glRenderbufferStorageEXT, [ :uint, :uint, :int, :int ], :void]
+    ]
+  end
+
+  module RenderContext
+    include Roglew::RenderContextExtension
 
     def create_framebufferEXT(*args)
       Roglew::FramebufferEXT.new(self, *args)
@@ -97,6 +106,7 @@ module GL_EXT_framebuffer_object
       [:renderbuffer_parameterEXT, :glGetRenderbufferParameterivEXT],
     ].each do |method_name, function_name|
       #call without pointer parameter (int *params)
+      checks_current
       define_method(method_name) do |*args|
         ptr = FFI::MemoryPointer.new(:int)
         public_send(function_name, *(args << ptr))
@@ -119,8 +129,9 @@ module GL_EXT_framebuffer_object
   end
 end
 
-%w'renderbuffer_context
-renderbuffer
-framebuffer_context
-framebuffer
+%w'
+  renderbuffer_context
+  renderbuffer
+  framebuffer_context
+  framebuffer
 '.each { |f| require "#{File.expand_path(__FILE__)[0..-4]}/#{f}" }

data/lib/roglew/extensions/GL_EXT_framebuffer_object/framebuffer.rb

@@ -2,18 +2,18 @@ module Roglew
   class FramebufferEXT
     include Roglew::Contextual(FramebufferContextEXT)
 
-    attr_reader :context, :id
+    attr_reader :handle, :id
 
-    def initialize(context)
-      @context = context
-      @id = context.gen_framebuffersEXT
-      ObjectSpace.define_finalizer(self, self.class.finalize(@context, @id))
+    def initialize(handle)
+      @handle = handle
+      @id = handle.bind { |context| context.gen_framebuffersEXT }
+      ObjectSpace.define_finalizer(self, self.class.finalize(@handle, @id))
     end
 
-    def self.finalize(ctx, id)
+    def self.finalize(handle, id)
       proc do
-        puts "releasing framebuffer #{id}"
-        ctx.delete_framebuffersEXT(id)
+        #puts "releasing framebuffer #{id}"
+        handle.bind { |context| context.delete_framebuffersEXT(id) }
       end
     end
 

data/lib/roglew/extensions/GL_EXT_framebuffer_object/framebuffer_context.rb

@@ -1,11 +1,16 @@
 module Roglew
   module ImmediateFramebufferContextEXT
+    def included(c)
+      c.make_calls :handle, :glCheckFramebufferStatusEXT
+      c.make_calls :context, :framebuffer_attachment_parameterEXT
+    end
+
     def status
-      context.glCheckFramebufferStatusEXT(@target)
+      glCheckFramebufferStatusEXT(@target)
     end
 
     def attachment_parameter(attachment, pname)
-      context.framebuffer_attachment_parameterEXT(GL::FRAMEBUFFER_EXT, attachment, pname)
+      framebuffer_attachment_parameterEXT(GL::FRAMEBUFFER_EXT, attachment, pname)
     end
   end
 
@@ -14,6 +19,11 @@ module Roglew
 
     immediate_module ImmediateFramebufferContextEXT
 
+    make_calls :handle,
+               :glBindFramebufferEXT,
+               :glFramebufferRenderbufferEXT,
+               :glFramebufferTexture2DEXT
+
     def initialize(framebuffer, deferred, target, &block)
       @target = target
       super(framebuffer, deferred, &block)
@@ -22,21 +32,21 @@ module Roglew
     def attach(obj, attachment, level = 0)
       case obj
         when RenderbufferEXT
-          make_call(:glFramebufferRenderbufferEXT, @target, attachment, GL::RENDERBUFFER_EXT, obj.id)
+          glFramebufferRenderbufferEXT(@target, attachment, GL::RENDERBUFFER_EXT, obj.id)
         when Texture2d
           #TODO glFramebufferTexture1DEXT glFramebufferTexture3DEXT
-          make_call(:glFramebufferTexture2DEXT, @target, attachment, GL::TEXTURE_2D, obj.id, level)
+          glFramebufferTexture2DEXT(@target, attachment, GL::TEXTURE_2D, obj.id, level)
         else raise ArgumentError, "first parameter isn't a RenderbufferEXT nor a Texture2d"
       end
     end
 
     private
     def bind
-      context.glBindFramebufferEXT(@target, framebuffer.id)
+      glBindFramebufferEXT(@target, framebuffer.id)
     end
 
     def unbind
-      context.glBindFramebufferEXT(@target, 0)
+      glBindFramebufferEXT(@target, 0)
     end
   end
 end