Changeset 513

Timestamp:

08/23/10 23:22:57 (2 years ago)

Author:

aldacron

Message:

[Derelict2 - DerelictGL]
* wgl extensions are now properly organized in version blocks
* added support for the following extensions:
WGL_I3D_digital_video_control
WGL_I3D_gamma
WGL_I3D_genlock
WGL_I3D_image_buffer
WGL_I3D_swap_frame_lock
WGL_I3D_swap_frame_usage
WGL_NV_copy_image
WGL_NV_float_buffer
WGL_NV_gpu_affinity
WGL_NV_multisample_coverage
WGL_NV_present_video
WGL_NV_render_depth_texture
WGL_NV_render_texture_rectangle
WGL_NV_swap_group
WGL_NV_vertex_array_range
WGL_NV_video_output
WGL_OML_sync_control

Files:

• branches/Derelict2/DerelictGL/derelict/opengl/extfuncs.d (modified) (2 diffs)
• branches/Derelict2/DerelictGL/derelict/opengl/extloader.d (modified) (6 diffs)
• branches/Derelict2/DerelictGL/derelict/opengl/exttypes.d (modified) (2 diffs)
• branches/Derelict2/DerelictUtil/derelict/util/wintypes.d (modified) (5 diffs)

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

@@ -66 +66 @@
-    version = DerelictGL_GREMEDY;
-    version = DerelictGL_MESAX;
+    version = DerelictGL_I3D;
+    version = DerelictGL_3DL;
-}
-
@@ -1770 +1772 @@
-    version(Windows)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    ");

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

@@ -87 +87 @@
-    version = DerelictGL_GREMEDY;
-    version = DerelictGL_MESAX;
+    version = DerelictGL_I3D;
+    version = DerelictGL_3DL;
-}
-
@@ -586 +588 @@
-        version (Windows)
-        {
-
+
+
-            loaded["WGL_ARB_extensions_string"] = load_WGL_ARB_extensions_string();
+            loaded["WGL_EXT_extensions_string"] = load_WGL_EXT_extensions_string();
+
+            if(wglGetExtensionsStringARB is null)
+                wglGetExtensionsStringARB = wglGetExtensionsStringEXT;
-
-            // load the wgl extensions string
@@ -600 +607 @@
-
-            // now load the other WGL extensions
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -5640 +5695 @@
-    version(Windows)
-    {
+        // These two functions should always be compiled in.
-        GLExtensionState load_WGL_ARB_extensions_string()
-        {
@@ -5648 +5704 @@
-        }
-
-        GLExtensionState load_WGL_ARB_buffer_region()
-        {
-            if(!extIsSupported("WGL_ARB_buffer_region"))
-                return GLExtensionState.DriverUnsupported;
-            if(!bindExtFunc(cast(void**)&wglCreateBufferRegionARB, "wglCreateBufferRegionARB"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglDeleteBufferRegionARB, "wglDeleteBufferRegionARB"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglSaveBufferRegionARB, "wglSaveBufferRegionARB"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglRestoreBufferRegionARB, "wglRestoreBufferRegionARB"))
-                return GLExtensionState.FailedToLoad;
-            return GLExtensionState.Loaded;
-        }
-
-        GLExtensionState load_WGL_ARB_multisample()
-        {
-            if(!extIsSupported("WGL_ARB_multisample"))
-                return GLExtensionState.DriverUnsupported;
-            return GLExtensionState.Loaded;
-        }
-
-        GLExtensionState load_WGL_ARB_pixel_format()
-        {
-            if(!extIsSupported("WGL_ARB_pixel_format"))
-                return GLExtensionState.DriverUnsupported;
-            if(!bindExtFunc(cast(void**)&wglGetPixelFormatAttribivARB, "wglGetPixelFormatAttribivARB"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglGetPixelFormatAttribfvARB, "wglGetPixelFormatAttribfvARB"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglChoosePixelFormatARB, "wglChoosePixelFormatARB"))
-                return GLExtensionState.FailedToLoad;
-            return GLExtensionState.Loaded;
-        }
-
-        GLExtensionState load_WGL_ARB_make_current_read()
-        {
-            if(!extIsSupported("WGL_ARB_make_current_read"))
-                return GLExtensionState.DriverUnsupported;
-            if(!bindExtFunc(cast(void**)&wglMakeContextCurrentARB, "wglMakeContextCurrentARB"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglGetCurrentReadDCARB, "wglGetCurrentReadDCARB"))
-                return GLExtensionState.FailedToLoad;
-            return GLExtensionState.Loaded;
-        }
-
-        GLExtensionState load_WGL_ARB_pbuffer()
-        {
-            if(!extIsSupported("WGL_ARB_pbuffer"))
-                return GLExtensionState.DriverUnsupported;
-            if(!bindExtFunc(cast(void**)&wglCreatePbufferARB, "wglCreatePbufferARB"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglGetPbufferDCARB, "wglGetPbufferDCARB"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglReleasePbufferDCARB, "wglReleasePbufferDCARB"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglDestroyPbufferARB, "wglDestroyPbufferARB"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglQueryPbufferARB, "wglQueryPbufferARB"))
-                return GLExtensionState.FailedToLoad;
-            return GLExtensionState.Loaded;
-        }
-
-        GLExtensionState load_WGL_ARB_render_texture()
-        {
-            if(!extIsSupported("WGL_ARB_render_texture"))
-                return GLExtensionState.DriverUnsupported;
-            if(!bindExtFunc(cast(void**)&wglBindTexImageARB, "wglBindTexImageARB"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglReleaseTexImageARB, "wglReleaseTexImageARB"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglSetPbufferAttribARB, "wglSetPbufferAttribARB"))
-                return GLExtensionState.FailedToLoad;
-            return GLExtensionState.Loaded;
-        }
-
-        GLExtensionState load_WGL_ARB_pixel_format_float()
-        {
-            if(!extIsSupported("WGL_ARB_pixel_format_float"))
-                return GLExtensionState.DriverUnsupported;
-            return GLExtensionState.Loaded;
-        }
-
-        GLExtensionState load_WGL_ARB_create_context()
-        {
-            if(!extIsSupported("WGL_ARB_create_context"))
-                return GLExtensionState.DriverUnsupported;
-            if(!bindExtFunc(cast(void**)&wglCreateContextAttribsARB, "wglCreateContextAttribsARB"))
-                return GLExtensionState.FailedToLoad;
-            return GLExtensionState.Loaded;
-        }
-
-        GLExtensionState load_WGL_ARB_framebuffer_sRGB()
-        {
-            if(!extIsSupported("WGL_ARB_framebuffer_sRGB"))
-                return GLExtensionState.DriverUnsupported;
-            return GLExtensionState.Loaded;
-        }
-
-        GLExtensionState load_WGL_ARB_create_context_profile()
-        {
-            if(!extIsSupported("WGL_ARB_create_context_profile"))
-                return GLExtensionState.DriverUnsupported;
-            return GLExtensionState.Loaded;
-        }
-
-        GLExtensionState load_WGL_EXT_depth_float()
-        {
-            if(!extIsSupported("WGL_EXT_depth_float"))
-                return GLExtensionState.DriverUnsupported;
-            return GLExtensionState.Loaded;
-        }
-
-        GLExtensionState load_WGL_EXT_display_color_table()
-        {
-            if(!extIsSupported("WGL_EXT_display_color_table"))
-                return GLExtensionState.DriverUnsupported;
-            if(!bindExtFunc(cast(void**)&wglBindDisplayColorTableEXT, "wglBindDisplayColorTableEXT"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglCreateDisplayColorTableEXT, "wglCreateDisplayColorTableEXT"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglDestroyDisplayColorTableEXT, "wglDestroyDisplayColorTableEXT"))
-                return GLExtensionState.FailedToLoad;
-            if(!bindExtFunc(cast(void**)&wglLoadDisplayColorTableEXT, "wglLoadDisplayColorTableEXT"))
-                return GLExtensionState.FailedToLoad;
-            return GLExtensionState.Loaded;
-        }
-
-        GLExtensionState load_WGL_EXT_extensions_string()
-        {
@@ -5783 +5711 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}

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

@@ -60 +60 @@
-    version = DerelictGL_GREMEDY;
-    version = DerelictGL_MESAX;
+    version = DerelictGL_I3D;
+    version = DerelictGL_3DL;
-}
-
@@ -3207 +3209 @@
-version(Windows)
-{
-
-
-
-
+
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}

branches/Derelict2/DerelictUtil/derelict/util/wintypes.d

@@ -42 +42 @@
-    alias uint DWORD;
-    alias ushort WORD;
+    alias ushort USHORT;
-    alias uint UINT;
-    alias int INT;
@@ -51 +52 @@
-
-    alias CCPTR LPCSTR;
-C
+
-
-    alias void* HANDLE;
@@ -141 +142 @@
-    }
-
-
-
-
+
-
-    enum : BYTE
@@ -215 +214 @@
-    }
-
+    struct RECT
+    {
+        LONG    left;
+        LONG    top;
+        LONG    right;
+        LONG    bottom;
+    }
+
-    extern(Windows)
-    {
@@ -226 +233 @@
-        void FreeLibrary(HMODULE);
-        DWORD GetLastError();
-LPCVOID
+in void*
-        HLOCAL LocalFree(HLOCAL);
-    }