opengl-core 1.3.2 → 2.0.0

data/lib/opengl-core/{gl_enums.rb → gl-enums.rb}

@@ -1,4 +1,14 @@
-module Gl
+#  This file is part of the opengl-core project.
+#  <https://github.com/nilium/ruby-opengl>
+#
+#  -----------------------------------------------------------------------------
+#
+#  gl-enums.rb
+#    File containing GL enumerators.
+#    This file is generated by gen_from_xml.rb, do not modify it.
+
+
+module GL
   # @api raw
   GL_DEPTH_BUFFER_BIT                                           = 0x00000100
   # @api raw
@@ -24,8 +34,6 @@ module Gl
   # @api raw
   GL_TRIANGLE_FAN                                               = 0x0006
   # @api raw
-  GL_QUADS                                                      = 0x0007
-  # @api raw
   GL_NEVER                                                      = 0x0200
   # @api raw
   GL_LESS                                                       = 0x0201
@@ -616,6 +624,24 @@ module Gl
   # @api raw
   GL_TEXTURE_COMPARE_FUNC                                       = 0x884D
   # @api raw
+  GL_FUNC_ADD                                                   = 0x8006
+  # @api raw
+  GL_FUNC_SUBTRACT                                              = 0x800A
+  # @api raw
+  GL_FUNC_REVERSE_SUBTRACT                                      = 0x800B
+  # @api raw
+  GL_MIN                                                        = 0x8007
+  # @api raw
+  GL_MAX                                                        = 0x8008
+  # @api raw
+  GL_CONSTANT_COLOR                                             = 0x8001
+  # @api raw
+  GL_ONE_MINUS_CONSTANT_COLOR                                   = 0x8002
+  # @api raw
+  GL_CONSTANT_ALPHA                                             = 0x8003
+  # @api raw
+  GL_ONE_MINUS_CONSTANT_ALPHA                                   = 0x8004
+  # @api raw
   GL_BUFFER_SIZE                                                = 0x8764
   # @api raw
   GL_BUFFER_USAGE                                               = 0x8765
@@ -1650,6 +1676,8 @@ module Gl
   # @api raw
   GL_ISOLINES                                                   = 0x8E7A
   # @api raw
+  GL_QUADS                                                      = 0x0007
+  # @api raw
   GL_FRACTIONAL_ODD                                             = 0x8E7B
   # @api raw
   GL_FRACTIONAL_EVEN                                            = 0x8E7C
@@ -1980,6 +2008,14 @@ module Gl
   # @api raw
   GL_MAX_COMBINED_IMAGE_UNIFORMS                                = 0x90CF
   # @api raw
+  GL_COMPRESSED_RGBA_BPTC_UNORM                                 = 0x8E8C
+  # @api raw
+  GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM                           = 0x8E8D
+  # @api raw
+  GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT                           = 0x8E8E
+  # @api raw
+  GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT                         = 0x8E8F
+  # @api raw
   GL_TEXTURE_IMMUTABLE_FORMAT                                   = 0x912F
   # @api raw
   GL_NUM_SHADING_LANGUAGE_VERSIONS                              = 0x82E9
@@ -2030,13 +2066,13 @@ module Gl
   # @api raw
   GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS                    = 0x8266
   # @api raw
-  GL_MAX_COMPUTE_LOCAL_INVOCATIONS                              = 0x90EB
+  GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS                         = 0x90EB
   # @api raw
   GL_MAX_COMPUTE_WORK_GROUP_COUNT                               = 0x91BE
   # @api raw
   GL_MAX_COMPUTE_WORK_GROUP_SIZE                                = 0x91BF
   # @api raw
-  GL_COMPUTE_LOCAL_WORK_SIZE                                    = 0x8267
+  GL_COMPUTE_WORK_GROUP_SIZE                                    = 0x8267
   # @api raw
   GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER                 = 0x90EC
   # @api raw
@@ -2108,6 +2144,8 @@ module Gl
   # @api raw
   GL_PROGRAM                                                    = 0x82E2
   # @api raw
+  GL_VERTEX_ARRAY                                               = 0x8074
+  # @api raw
   GL_QUERY                                                      = 0x82E3
   # @api raw
   GL_PROGRAM_PIPELINE                                           = 0x82E4
@@ -2500,6 +2538,10 @@ module Gl
   # @api raw
   GL_MAX_VERTEX_ATTRIB_STRIDE                                   = 0x82E5
   # @api raw
+  GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED                    = 0x8221
+  # @api raw
+  GL_TEXTURE_BUFFER_BINDING                                     = 0x8C2A
+  # @api raw
   GL_MAP_PERSISTENT_BIT                                         = 0x0040
   # @api raw
   GL_MAP_COHERENT_BIT                                           = 0x0080
@@ -2563,4 +2605,4 @@ module Gl
   GL_PROGRAM_POINT_SIZE                                         = GL_VERTEX_PROGRAM_POINT_SIZE
   # @api raw
   GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES                       = GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS
-end # module Gl
+end # module GL

data/lib/opengl-core/gl-sym.rb

@@ -0,0 +1,74 @@
+#  This file is part of the opengl-core project.
+#  <https://github.com/nilium/ruby-opengl>
+#
+#  -----------------------------------------------------------------------------
+#
+#  gl_sym.rb
+#    GL symbol loader front-end.
+
+
+module GL
+
+# @api private
+#
+# Symbol loading is currently handled by Fiddle, though it's entirely possible
+# for someone to swap out loaders they want.
+#
+# Loaders must provide two methods:
+#   - load_sym(name, types)
+#     name is the name of the GL symbol to load, types is a dictionary
+#     of keys return_type and parameter_types, the former being a symbol
+#     defining the return type of the function and parameter_types being an
+#     array of the parameter types received by the function.
+#
+#   - unload()
+#     Called to unload any resources held by the loader in the event that the
+#     loader is swapped out at runtime.
+#
+module GLSym
+
+  # Filled by gl_commands.rb
+  GL_COMMAND_TYPES = {}
+
+  class << self
+
+    attr_accessor :loader
+    attr_accessor :__cached_functions__
+
+    alias_method :__loader__=, :loader=
+    def loader=(new_loader)
+      return if self.loader == new_loader
+      self.loader.unload if self.loader
+      self.__cached_functions__.clear if self.__cached_functions__
+      self.__loader__ = new_loader
+    end
+
+    # Loads the GL symbol with the given name. It's assumed that this symbol
+    # has its types defined in GL_COMMAND_TYPES.
+    def load_sym(name)
+      functions = (self.__cached_functions__ ||= {})
+      functions[name] ||= begin
+        symfunc = self.loader.load_sym(name, GL_COMMAND_TYPES[name])
+
+        if symfunc.nil?
+          raise NoMethodError, "GL function #{name} could not be loaded"
+        end
+
+        symfunc
+      end
+    end
+
+  end # singleton_class
+
+end # GLSym
+
+end # GL
+
+
+begin
+  require 'opengl-core/gl-sym/fiddle-symbol-loader'
+
+  GL::GLSym.loader = GL::GLSym::FiddleSymbolLoader.new
+rescue LoadError
+  warn "FiddleSymbolLoader could not be loaded - GLSym has no default loader"
+end

data/lib/opengl-core/gl-sym/fiddle-symbol-loader.rb

@@ -0,0 +1,130 @@
+#  This file is part of the opengl-core project.
+#  <https://github.com/nilium/ruby-opengl>
+#
+#  -----------------------------------------------------------------------------
+#
+#  fiddle-symbol-loader.rb
+#    Fiddle-based GL symbol loader.
+
+
+require 'fiddle'
+require 'rbconfig'
+
+
+module GL
+
+module GLSym
+
+class FiddleSymbolLoader
+
+  TYPE_MAPPINGS = {
+    :'void'              => Fiddle::TYPE_VOID,
+    :'GLvoid'            => Fiddle::TYPE_VOID,
+    :'GLenum'            => Fiddle::TYPE_INT,
+    :'GLboolean'         => Fiddle::TYPE_CHAR,
+    :'GLbitfield'        => Fiddle::TYPE_INT,
+    :'GLbyte'            => Fiddle::TYPE_CHAR,
+    :'GLshort'           => Fiddle::TYPE_SHORT,
+    :'GLint'             => Fiddle::TYPE_INT,
+    :'GLclampx'          => Fiddle::TYPE_INT,
+    :'GLubyte'           => Fiddle::TYPE_CHAR,
+    :'GLushort'          => Fiddle::TYPE_SHORT,
+    :'GLuint'            => Fiddle::TYPE_INT,
+    :'GLsizei'           => Fiddle::TYPE_INT,
+    :'GLfloat'           => Fiddle::TYPE_FLOAT,
+    :'GLclampf'          => Fiddle::TYPE_FLOAT,
+    :'GLdouble'          => Fiddle::TYPE_DOUBLE,
+    :'GLclampd'          => Fiddle::TYPE_DOUBLE,
+    :'GLchar'            => Fiddle::TYPE_CHAR,
+    :'GLcharARB'         => Fiddle::TYPE_CHAR,
+    :'GLhandleARB'       => Fiddle::TYPE_UINTPTR_T,
+    :'GLhalfARB'         => Fiddle::TYPE_SHORT,
+    :'GLhalf'            => Fiddle::TYPE_SHORT,
+    :'GLfixed'           => Fiddle::TYPE_INT,
+    :'GLintptr'          => Fiddle::TYPE_PTRDIFF_T,
+    :'GLsizeiptr'        => Fiddle::TYPE_PTRDIFF_T,
+    :'GLint64'           => Fiddle::TYPE_LONG_LONG,
+    :'GLuint64'          => Fiddle::TYPE_LONG_LONG,
+    :'GLintptrARB'       => Fiddle::TYPE_PTRDIFF_T,
+    :'GLsizeiptrARB'     => Fiddle::TYPE_PTRDIFF_T,
+    :'GLint64EXT'        => Fiddle::TYPE_LONG_LONG,
+    :'GLuint64EXT'       => Fiddle::TYPE_LONG_LONG,
+    :'GLsync'            => Fiddle::TYPE_VOIDP,
+    :'GLhalfNV'          => Fiddle::TYPE_SHORT,
+    :'GLvdpauSurfaceNV'  => Fiddle::TYPE_PTRDIFF_T,
+    :'GLDEBUGPROC'       => Fiddle::TYPE_VOIDP,
+    :'GLDEBUGPROCARB'    => Fiddle::TYPE_VOIDP,
+    :'GLDEBUGPROCKHR'    => Fiddle::TYPE_VOIDP,
+    :'GLDEBUGPROCAMD'    => Fiddle::TYPE_VOIDP,
+  }
+
+  TYPE_MAPPINGS.default_proc = -> (hash, key) do
+    if key.to_s.end_with?('*')
+      hash[key] = Fiddle::TYPE_VOIDP
+    else
+      raise ArgumentError, "No type mapping defined for #{key}"
+    end
+  end
+
+  def fiddle_typed(types)
+    case types
+    when Array then types.map { |i| fiddle_typed(i) }
+    else TYPE_MAPPINGS[types.to_sym]
+    end
+  end
+
+  def initialize
+    @opengl_lib = nil
+    @loaded = {}
+  end
+
+  def unload
+    if @opengl_lib
+      @opengl_lib.close
+      @opengl_lib = nil
+    end
+
+    @loaded.clear
+  end
+
+  # Loads a symbol from the GL library. If the GL library hasn't yet been loaded
+  # it will also do that. The returned function will be a wrapped Fiddle
+  # function using the types that function name is associated with in
+  # GL_COMMAND_TYPES. The returned value is cached in GL_COMMAND_FUNCTIONS and
+  # returned if load_sym is called for the same name again.
+  def load_sym(name, types)
+    if @opengl_lib.nil?
+      host = RbConfig::CONFIG['host_os']
+      lib_path =
+        case host
+        when %r[ mac\sos | darwin ]ix
+          '/System/Library/Frameworks/OpenGL.framework/OpenGL'
+        when %r[ mswin | msys | mingw | cygwin | bcwin | wince | emc ]ix
+          'opengl32.dll'
+        when %r[ linux | solaris | bsd]ix
+          'libGL.so.1'
+        else
+          raise 'Unrecognized platform'
+        end
+
+      @opengl_lib = Fiddle.dlopen(lib_path)
+    end
+
+    begin
+      sym = @opengl_lib[name.to_s]
+
+      Fiddle::Function.new(
+        sym,
+        fiddle_typed(types[:parameter_types]),
+        fiddle_typed(types[:return_type])
+        )
+    rescue Fiddle::DLError
+      nil
+    end if @opengl_lib
+  end
+
+end # FiddleSymbolLoader
+
+end # GLSym
+
+end # GL

metadata

@@ -1,51 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: opengl-core
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Noel Raymond Cower
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 description: OpenGL core profile (3.2 onward, no deprecated functionality) bindings
   for Ruby 2.x. Generated from Khronos XML spec files.
 email: ncower@gmail.com
 executables: []
-extensions:
-- ext/opengl-core/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
-- lib/opengl-core/aux/buffer.rb
-- lib/opengl-core/aux/gl.rb
-- lib/opengl-core/aux/marked.rb
-- lib/opengl-core/aux/program.rb
-- lib/opengl-core/aux/shader.rb
-- lib/opengl-core/aux/texture.rb
-- lib/opengl-core/aux/vertex_array.rb
-- lib/opengl-core/aux.rb
-- lib/opengl-core/gl_commands.rb
-- lib/opengl-core/gl_enums.rb
-- lib/opengl-core/gl_sym.rb
+- COPYING
+- README.md
 - lib/opengl-core.rb
-- ext/opengl-core/opengl_stub.c
-- ext/opengl-core/extconf.rb
+- lib/opengl-core/gl-commands.rb
+- lib/opengl-core/gl-enums.rb
+- lib/opengl-core/gl-sym.rb
+- lib/opengl-core/gl-sym/fiddle-symbol-loader.rb
 homepage: https://github.com/nilium/ruby-opengl
 licenses:
 - Simplified BSD
@@ -56,17 +48,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: OpenGL core profile bindings

data/ext/opengl-core/extconf.rb

@@ -1,3 +0,0 @@
-require 'mkmf'
-
-create_makefile('opengl-core/opengl_stub')

data/ext/opengl-core/opengl_stub.c

@@ -1,56 +0,0 @@
-#include "ruby.h"
-
-
-/* @api private */
-static VALUE plat_is_apple(VALUE self)
-{
-  #if defined(__APPLE__)
-  return Qtrue;
-  #else
-  return Qfalse;
-  #endif
-}
-
-
-/* @api private */
-static VALUE plat_is_windows(VALUE self)
-{
-  #if defined(_WIN32) || defined(__MINGW32__) || defined(__CYGWIN__)
-  return Qtrue;
-  #else
-  return Qfalse;
-  #endif
-}
-
-
-/* @api private */
-static VALUE plat_is_unix(VALUE self)
-{
-  #if defined(__unix) || defined(__unix__) || defined(unix) || defined(__APPLE__)
-  return Qtrue;
-  #else
-  return Qfalse;
-  #endif
-}
-
-
-/* @api private */
-static VALUE plat_is_linux(VALUE self)
-{
-  #if defined(__linux__) || defined(linux) || defined(__linux)
-  return Qtrue;
-  #else
-  return Qfalse;
-  #endif
-}
-
-
-void Init_opengl_stub(void)
-{
-  VALUE gl_module = rb_define_module("Gl");
-  VALUE gl_sym_module = rb_define_module_under(gl_module, "GlSym");
-  rb_define_singleton_method(gl_sym_module, "apple?", plat_is_apple, 0);
-  rb_define_singleton_method(gl_sym_module, "windows?", plat_is_windows, 0);
-  rb_define_singleton_method(gl_sym_module, "unix?", plat_is_unix, 0);
-  rb_define_singleton_method(gl_sym_module, "linux?", plat_is_linux, 0);
-}