Changeset 523 for branches/Derelict2/DerelictGL/derelict/opengl

Timestamp:

12/08/10 08:41:04 (2 years ago)

Author:

aldacron

Message:

[Derelict2 - DerelictGL]
* added support for OpenGL 3.2, 3.3 and 4.0

Files:

• branches/Derelict2/DerelictGL/derelict/opengl/gl.d (modified) (4 diffs)
• branches/Derelict2/DerelictGL/derelict/opengl/glfuncs.d (modified) (1 diff)
• branches/Derelict2/DerelictGL/derelict/opengl/gltypes.d (modified) (1 diff)

branches/Derelict2/DerelictGL/derelict/opengl/gl.d

@@ -80 +80 @@
-    GL30 = 30,
-    GL31 = 31,
-
-
+
+
+
+
+
-}
-
@@ -99 +102 @@
-    {
-        string verstr = toDString(glGetString(GL_VERSION));
-
+
+
+
+
+
+
+
-            return GLVersion.GL31;
-        else if(verstr.findStr("3.0") == 0)
@@ -565 +574 @@
-            _maxVersion = GLVersion.GL31;
-        }
+        
+        if(maxAvail >= GLVersion.GL32)
+        {
+            bindExtendedFunc(cast(void**)&glFramebufferTexture, "glFramebufferTexture", doThrow);
+            bindExtendedFunc(cast(void**)&glGetBufferParameteri64v, "glGetBufferParameteri64v", doThrow);
+            bindExtendedFunc(cast(void**)&glGetInteger64i_v, "glGetInteger64i_v", doThrow);
+            
+            _maxVersion = GLVersion.GL32;
+        }
+        
+        if(maxAvail >= GLVersion.GL33)
+        {
+            bindExtendedFunc(cast(void**)&glVertexAttribDivisor, "glVertexAttribDivisor", doThrow);
+        
+            _maxVersion = GLVersion.GL33;
+        }
+        
+        if(maxAvail >= GLVersion.GL40)
+        {
+            bindExtendedFunc(cast(void**)&glBlendEquationSeparatei, "glBlendEquationSeparatei", doThrow);
+            bindExtendedFunc(cast(void**)&glBlendEquationi, "glBlendEquationi", doThrow);
+            bindExtendedFunc(cast(void**)&glBlendFuncSeparatei, "glBlendFuncSeparatei", doThrow);
+            bindExtendedFunc(cast(void**)&glBlendFunci, "glBlendFunci", doThrow);
+            bindExtendedFunc(cast(void**)&glMinSampleShading, "glMinSampleShading", doThrow);
+            
+            _maxVersion = GLVersion.GL40;
+        }
-
-        return _maxVersion;
@@ -573 +609 @@
-        switch(ver)
-        {
+            case GLVersion.GL40:
+                return "OpenGL Version 4.0";
+            case GLVersion.GL33:
+                return "OpenGL Version 3.3";
+            case GLVersion.GL32:
+                return "OpenGL Version 3.2";
-            case GLVersion.GL31:
-                return "OpenGL Version 3.1";

branches/Derelict2/DerelictGL/derelict/opengl/glfuncs.d

@@ -675 +675 @@
-    void function(GLuint) glPrimitiveRestartIndex;
-    void function(GLenum, GLenum, GLuint) glTexBuffer;
+    
+    // gl 3.2
+    void function(GLenum, GLenum, GLuint, GLuint) glFramebufferTexture;
+    void function(GLenum, GLenum, GLint64*) glGetBufferParameteri64v;
+    void function(GLenum, GLuint, GLint64*) glGetInteger64i_v;
+    
+    // gl 3.3
+    void function(GLuint, GLuint) glVertexAttribDivisor;
+    
+    // gl 4.0
+    void function(GLuint, GLenum, GLenum) glBlendEquationSeparatei;
+    void function(GLuint, GLenum) glBlendEquationi;
+    void function(GLuint, GLenum, GLenum, GLenum, GLenum) glBlendFuncSeparatei;
+    void function(GLuint, GLenum, GLenum) glBlendFunci;
+    void function(GLclampf) glMinSampleShading;
+    
-    ");
-}

branches/Derelict2/DerelictGL/derelict/opengl/gltypes.d

@@ -1197 +1197 @@
-    GL_BUFFER_MAP_OFFSET            = 0x9121,
-}
+
+// gl 3.2
+alias long GLint64;
+
+enum : int
+{
+    GL_CONTEXT_CORE_PROFILE_BIT     = 0x00000001,
+    GL_CONTEXT_COMPATIBILITY_PROFILE_BIT = 0x00000002,
+}
+
+enum : GLenum
+{   
+    GL_LINES_ADJACENCY              = 0x000A,
+    GL_LINE_STRIP_ADJACENCY         = 0x000B,
+    GL_TRIANGLES_ADJACENCY          = 0x000C,
+    GL_TRIANGLE_STRIP_ADJACENCY     = 0x000D,
+    GL_PROGRAM_POINT_SIZE           = 0x8642,
+    GL_GEOMETRY_VERTICES_OUT        = 0x8916,
+    GL_GEOMETRY_INPUT_TYPE          = 0x8917,
+    GL_GEOMETRY_OUTPUT_TYPE         = 0x8918,
+    GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS = 0x8C29,
+    GL_FRAMEBUFFER_ATTACHMENT_LAYERED = 0x8DA7,
+    GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS = 0x8DA8,
+    GL_GEOMETRY_SHADER              = 0x8DD9,
+    GL_MAX_GEOMETRY_UNIFORM_COMPONENTS = 0x8DDF,
+    GL_MAX_GEOMETRY_OUTPUT_VERTICES = 0x8DE0,
+    GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS = 0x8DE1,
+    GL_MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122,
+    GL_MAX_GEOMETRY_INPUT_COMPONENTS = 0x9123,
+    GL_MAX_GEOMETRY_OUTPUT_COMPONENTS = 0x9124,
+    GL_MAX_FRAGMENT_INPUT_COMPONENTS = 0x9125,
+    GL_CONTEXT_PROFILE_MASK         = 0x9126,   
+}
+
+// gl 3.3
+enum : GLenum
+{
+    GL_VERTEX_ATTRIB_ARRAY_DIVISOR = 0x88FE,
+    GL_ANY_SAMPLES_PASSED       = 0x8C2F,
+    GL_TEXTURE_SWIZZLE_R        = 0x8E42,
+    GL_TEXTURE_SWIZZLE_G        = 0x8E43,
+    GL_TEXTURE_SWIZZLE_B        = 0x8E44,
+    GL_TEXTURE_SWIZZLE_A        = 0x8E45,
+    GL_TEXTURE_SWIZZLE_RGBA     = 0x8E46,
+    GL_RGB10_A2UI               = 0x906F,   
+}
+
+// gl 4.0
+enum : GLenum
+{
+    GL_GEOMETRY_SHADER_INVOCATIONS = 0x887F,
+    GL_SAMPLE_SHADING           = 0x8C36,
+    GL_MIN_SAMPLE_SHADING_VALUE = 0x8C37,
+    GL_MAX_GEOMETRY_SHADER_INVOCATIONS = 0x8E5A,
+    GL_MIN_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5B,
+    GL_MAX_FRAGMENT_INTERPOLATION_OFFSET = 0x8E5C,
+    GL_FRAGMENT_INTERPOLATION_OFFSET_BITS = 0x8E5D,
+    GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5E,
+    GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET = 0x8E5F,
+    GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS = 0x8F9F,
+    GL_TEXTURE_CUBE_MAP_ARRAY   = 0x9009,
+    GL_TEXTURE_BINDING_CUBE_MAP_ARRAY = 0x900A,
+    GL_PROXY_TEXTURE_CUBE_MAP_ARRAY = 0x900B,
+    GL_SAMPLER_CUBE_MAP_ARRAY   = 0x900C,
+    GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW = 0x900D,
+    GL_INT_SAMPLER_CUBE_MAP_ARRAY = 0x900E,
+    GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY = 0x900F,
+}