Felix Hufnagel 9 年之前
父節點
當前提交
d58d8f6df5
共有 3 個文件被更改,包括 714 次插入721 次删除
  1. 22 25
      source/derelict/vulkan/functions.d
  2. 646 641
      source/derelict/vulkan/vk.d
  3. 46 55
      source/derelict/vulkan/vulkan.d

+ 22 - 25
source/derelict/vulkan/functions.d

@@ -27,13 +27,11 @@ DEALINGS IN THE SOFTWARE.
 */
 module derelict.vulkan.functions;
 
-private
-{
-    import derelict.vulkan.vk;
+private {
+	import derelict.vulkan.vk;
 }
 
-__gshared
-{
+__gshared {
 	PFN_vkAllocationFunction vkAllocationFunction;
 	PFN_vkReallocationFunction vkReallocationFunction;
 	PFN_vkFreeFunction vkFreeFunction;
@@ -85,7 +83,7 @@ __gshared
 	PFN_vkCreateEvent vkCreateEvent;
 	PFN_vkDestroyEvent vkDestroyEvent;
 	PFN_vkGetEventStatus vkGetEventStatus;
-	PFN_vkSetEvent vkSetEvent;	
+	PFN_vkSetEvent vkSetEvent;
 	PFN_vkResetEvent vkResetEvent;
 	PFN_vkCreateQueryPool vkCreateQueryPool;
 	PFN_vkDestroyQueryPool vkDestroyQueryPool;
@@ -177,8 +175,7 @@ __gshared
 	PFN_vkCmdNextSubpass vkCmdNextSubpass;
 	PFN_vkCmdEndRenderPass vkCmdEndRenderPass;
 	PFN_vkCmdExecuteCommands vkCmdExecuteCommands;
-	
-	
+
 	PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR;
 	PFN_vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceSupportKHR;
 	PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
@@ -197,28 +194,28 @@ __gshared
 	PFN_vkGetDisplayPlaneCapabilitiesKHR vkGetDisplayPlaneCapabilitiesKHR;
 	PFN_vkCreateDisplayPlaneSurfaceKHR vkCreateDisplayPlaneSurfaceKHR;
 	PFN_vkCreateSharedSwapchainsKHR vkCreateSharedSwapchainsKHR;
-	version(VK_USE_PLATFORM_XLIB_KHR) {
-	PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR;
-	PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR;
+	version (VK_USE_PLATFORM_XLIB_KHR) {
+		PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR;
+		PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR;
 	}
-	version(VK_USE_PLATFORM_XCB_KHR) {
-	PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR;
-	PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR;
+	version (VK_USE_PLATFORM_XCB_KHR) {
+		PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR;
+		PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR;
 	}
-	version(VK_USE_PLATFORM_WAYLAND_KHR) {
-	PFN_vkCreateWaylandSurfaceKHR vkCreateWaylandSurfaceKHR;
-	PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR;
+	version (VK_USE_PLATFORM_WAYLAND_KHR) {
+		PFN_vkCreateWaylandSurfaceKHR vkCreateWaylandSurfaceKHR;
+		PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR;
 	}
-	version(VK_USE_PLATFORM_MIR_KHR) {
-	PFN_vkCreateMirSurfaceKHR vkCreateMirSurfaceKHR;
-	PFN_vkGetPhysicalDeviceMirPresentationSupportKHR vkGetPhysicalDeviceMirPresentationSupportKHR;
+	version (VK_USE_PLATFORM_MIR_KHR) {
+		PFN_vkCreateMirSurfaceKHR vkCreateMirSurfaceKHR;
+		PFN_vkGetPhysicalDeviceMirPresentationSupportKHR vkGetPhysicalDeviceMirPresentationSupportKHR;
 	}
-	version(VK_USE_PLATFORM_ANDROID_KHR) {
-	PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR;
+	version (VK_USE_PLATFORM_ANDROID_KHR) {
+		PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR;
 	}
-	version(VK_USE_PLATFORM_WIN32_KHR) {
-	PFN_vkCreateWin32SurfaceKHR vkCreateWin32SurfaceKHR;
-	PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR vkGetPhysicalDeviceWin32PresentationSupportKHR;
+	version (VK_USE_PLATFORM_WIN32_KHR) {
+		PFN_vkCreateWin32SurfaceKHR vkCreateWin32SurfaceKHR;
+		PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR vkGetPhysicalDeviceWin32PresentationSupportKHR;
 	}
 	PFN_vkDebugReportCallbackEXT vkDebugReportCallbackEXT;
 	PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT;

File diff suppressed because it is too large
+ 646 - 641
source/derelict/vulkan/vk.d


+ 46 - 55
source/derelict/vulkan/vulkan.d

@@ -27,33 +27,28 @@ DEALINGS IN THE SOFTWARE.
 */
 module derelict.vulkan.vulkan;
 
-public
-{
-    import derelict.vulkan.vk;
-    import derelict.vulkan.functions;
+public {
+	import derelict.vulkan.vk;
+	import derelict.vulkan.functions;
 }
 
-private
-{
-    import derelict.util.loader;
-    import derelict.util.system;
+private {
+	import derelict.util.loader;
+	import derelict.util.system;
 
-    static if(Derelict_OS_Windows)
-        enum libNames = "vulkan.dll";
-    //~ else static if(Derelict_OS_Mac)
-        //~ enum libNames = "libglfw.3.dylib";
-    //~ else static if(Derelict_OS_Posix)
-        //~ enum libNames = "libglfw3.so,libglfw.so.3,/usr/local/lib/libglfw3.so,/usr/local/lib/libglfw.so.3";
-    else
-        static assert(0, "Need to implement vulkan libNames for this operating system.");
+	static if (Derelict_OS_Windows)
+		enum libNames = "vulkan.dll";
+	//~ else static if(Derelict_OS_Mac)
+	//~ enum libNames = "libglfw.3.dylib";
+	//~ else static if(Derelict_OS_Posix)
+	//~ enum libNames = "libglfw3.so,libglfw.so.3,/usr/local/lib/libglfw3.so,/usr/local/lib/libglfw.so.3";
+	else
+		static assert(0, "Need to implement vulkan libNames for this operating system.");
 }
 
-class DerelictVulkanLoader : SharedLibLoader
-{
-    protected
-    {
-        override void loadSymbols()
-        {		
+class DerelictVulkanLoader : SharedLibLoader {
+	protected {
+		override void loadSymbols() {
 			bindFunc(cast(void**)&vkAllocationFunction, "vkAllocationFunction");
 			bindFunc(cast(void**)&vkReallocationFunction, "vkReallocationFunction");
 			bindFunc(cast(void**)&vkFreeFunction, "vkFreeFunction");
@@ -249,7 +244,7 @@ class DerelictVulkanLoader : SharedLibLoader
 			bindFunc(cast(void**)&vkCmdNextSubpass, "vkCmdNextSubpass");
 			bindFunc(cast(void**)&vkCmdEndRenderPass, "vkCmdEndRenderPass");
 			bindFunc(cast(void**)&vkCmdExecuteCommands, "vkCmdExecuteCommands");
-			
+
 			bindFunc(cast(void**)&vkDestroySurfaceKHR, "vkDestroySurfaceKHR");
 			bindFunc(cast(void**)&vkGetPhysicalDeviceSurfaceSupportKHR, "vkGetPhysicalDeviceSurfaceSupportKHR");
 			bindFunc(cast(void**)&vkGetPhysicalDeviceSurfaceCapabilitiesKHR, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR");
@@ -268,52 +263,48 @@ class DerelictVulkanLoader : SharedLibLoader
 			bindFunc(cast(void**)&vkGetDisplayPlaneCapabilitiesKHR, "vkGetDisplayPlaneCapabilitiesKHR");
 			bindFunc(cast(void**)&vkCreateDisplayPlaneSurfaceKHR, "vkCreateDisplayPlaneSurfaceKHR");
 			bindFunc(cast(void**)&vkCreateSharedSwapchainsKHR, "vkCreateSharedSwapchainsKHR");
-			version(VK_USE_PLATFORM_XLIB_KHR) {
-			bindFunc(cast(void**)&vkCreateXlibSurfaceKHR, "vkCreateXlibSurfaceKHR");
-			bindFunc(cast(void**)&vkGetPhysicalDeviceXlibPresentationSupportKHR, "vkGetPhysicalDeviceXlibPresentationSupportKHR");
+			version (VK_USE_PLATFORM_XLIB_KHR) {
+				bindFunc(cast(void**)&vkCreateXlibSurfaceKHR, "vkCreateXlibSurfaceKHR");
+				bindFunc(cast(void**)&vkGetPhysicalDeviceXlibPresentationSupportKHR, "vkGetPhysicalDeviceXlibPresentationSupportKHR");
 			}
-			version(VK_USE_PLATFORM_XCB_KHR) {
-			bindFunc(cast(void**)&vkCreateXcbSurfaceKHR, "vkCreateXcbSurfaceKHR");
-			bindFunc(cast(void**)&vkGetPhysicalDeviceXcbPresentationSupportKHR, "vkGetPhysicalDeviceXcbPresentationSupportKHR");
+			version (VK_USE_PLATFORM_XCB_KHR) {
+				bindFunc(cast(void**)&vkCreateXcbSurfaceKHR, "vkCreateXcbSurfaceKHR");
+				bindFunc(cast(void**)&vkGetPhysicalDeviceXcbPresentationSupportKHR, "vkGetPhysicalDeviceXcbPresentationSupportKHR");
 			}
-			version(VK_USE_PLATFORM_WAYLAND_KHR) {
-			bindFunc(cast(void**)&vkCreateWaylandSurfaceKHR, "vkCreateWaylandSurfaceKHR");
-			bindFunc(cast(void**)&vkGetPhysicalDeviceWaylandPresentationSupportKHR, "vkGetPhysicalDeviceWaylandPresentationSupportKHR");
+			version (VK_USE_PLATFORM_WAYLAND_KHR) {
+				bindFunc(cast(void**)&vkCreateWaylandSurfaceKHR, "vkCreateWaylandSurfaceKHR");
+				bindFunc(cast(void**)&vkGetPhysicalDeviceWaylandPresentationSupportKHR, "vkGetPhysicalDeviceWaylandPresentationSupportKHR");
 			}
-			version(VK_USE_PLATFORM_MIR_KHR) {
-			bindFunc(cast(void**)&vkCreateMirSurfaceKHR, "vkCreateMirSurfaceKHR");
-			bindFunc(cast(void**)&vkGetPhysicalDeviceMirPresentationSupportKHR, "vkGetPhysicalDeviceMirPresentationSupportKHR");
+			version (VK_USE_PLATFORM_MIR_KHR) {
+				bindFunc(cast(void**)&vkCreateMirSurfaceKHR, "vkCreateMirSurfaceKHR");
+				bindFunc(cast(void**)&vkGetPhysicalDeviceMirPresentationSupportKHR, "vkGetPhysicalDeviceMirPresentationSupportKHR");
 			}
-			version(VK_USE_PLATFORM_ANDROID_KHR) {
-			bindFunc(cast(void**)&vkCreateAndroidSurfaceKHR, "vkCreateAndroidSurfaceKHR");
+			version (VK_USE_PLATFORM_ANDROID_KHR) {
+				bindFunc(cast(void**)&vkCreateAndroidSurfaceKHR, "vkCreateAndroidSurfaceKHR");
 			}
-			version(VK_USE_PLATFORM_WIN32_KHR) {
-			bindFunc(cast(void**)&vkCreateWin32SurfaceKHR, "vkCreateWin32SurfaceKHR");
-			bindFunc(cast(void**)&vkGetPhysicalDeviceWin32PresentationSupportKHR, "vkGetPhysicalDeviceWin32PresentationSupportKHR");
+			version (VK_USE_PLATFORM_WIN32_KHR) {
+				bindFunc(cast(void**)&vkCreateWin32SurfaceKHR, "vkCreateWin32SurfaceKHR");
+				bindFunc(cast(void**)&vkGetPhysicalDeviceWin32PresentationSupportKHR, "vkGetPhysicalDeviceWin32PresentationSupportKHR");
 			}
 			bindFunc(cast(void**)&vkDebugReportCallbackEXT, "vkDebugReportCallbackEXT");
 			bindFunc(cast(void**)&vkCreateDebugReportCallbackEXT, "vkCreateDebugReportCallbackEXT");
 			bindFunc(cast(void**)&vkDestroyDebugReportCallbackEXT, "vkDestroyDebugReportCallbackEXT");
 			bindFunc(cast(void**)&vkDebugReportMessageEXT, "vkDebugReportMessageEXT");
-        }
-    }
-    public
-    {
-        this()
-        {
-            super(libNames);
-        }
-    }
+		}
+	}
+	public {
+		this() {
+			super(libNames);
+		}
+	}
 }
 
 __gshared DerelictVulkanLoader DerelictVulkan;
 
-shared static this()
-{
-    DerelictVulkan = new DerelictVulkanLoader();
+shared static this() {
+	DerelictVulkan = new DerelictVulkanLoader();
 }
 
-shared static ~this()
-{
-    DerelictVulkan.unload();
+shared static ~this() {
+	DerelictVulkan.unload();
 }

Some files were not shown because too many files changed in this diff