Move files around

SWinxy · Dec 19, 2021 · baac5eb · baac5eb
1 parent 0a81946
commit baac5eb
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/src/org/lwjgl/vulkan/awt/AWT.java → src/org/lwjgl/awt/AWT.java b/src/org/lwjgl/vulkan/awt/AWT.java → src/org/lwjgl/awt/AWT.java
@@ -1,7 +1,8 @@
-package org.lwjgl.vulkan.awt;
+package org.lwjgl.awt;
 
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.system.MemoryUtil;
+import org.lwjgl.system.Platform;
 import org.lwjgl.system.jawt.JAWT;
 import org.lwjgl.system.jawt.JAWTDrawingSurface;
 import org.lwjgl.system.jawt.JAWTDrawingSurfaceInfo;
@@ -92,6 +93,14 @@ public AWT(Component component) throws AWTException {
 		}
 	}
 
+	/**
+	 * Checks if the platform is supported using lwjgl3-awt.
+	 * This does not check for the minimum OS version.
+	 */
+	public static boolean isPlatformSupported() {
+		return Platform.get() == Platform.WINDOWS || Platform.get() == Platform.MACOSX || Platform.get() == Platform.LINUX;
+	}
+
 	/**
 	 * Returns a pointer to a platform-specific struct with platform-specific information.
 	 * <p>

diff --git a/src/org/lwjgl/vulkan/awt/AWTVK.java b/src/org/lwjgl/vulkan/awt/AWTVK.java
@@ -12,14 +12,6 @@
  */
 public class AWTVK {
 
-	/**
-	 * Checks if the platform is supported using lwjgl3-awt.
-	 * This does not check for the minimum OS version.
-	 */
-	public static boolean isPlatformSupported() {
-		return Platform.get() == Platform.WINDOWS || Platform.get() == Platform.MACOSX || Platform.get() == Platform.LINUX;
-	}
-
 	/**
 	 * Gets the required surface extension for the platform.
 	 * Also enable {@link org.lwjgl.vulkan.KHRSurface#VK_KHR_SURFACE_EXTENSION_NAME VK_KHR_SURFACE_EXTENSION_NAME}.

diff --git a/src/org/lwjgl/vulkan/awt/PlatformMacOSXVKCanvas.java b/src/org/lwjgl/vulkan/awt/PlatformMacOSXVKCanvas.java
@@ -1,6 +1,7 @@
 package org.lwjgl.vulkan.awt;
 
 import org.lwjgl.PointerBuffer;
+import org.lwjgl.awt.AWT;
 import org.lwjgl.system.JNI;
 import org.lwjgl.system.Library;
 import org.lwjgl.system.MemoryStack;

diff --git a/src/org/lwjgl/vulkan/awt/PlatformWin32VKCanvas.java b/src/org/lwjgl/vulkan/awt/PlatformWin32VKCanvas.java
@@ -1,5 +1,6 @@
 package org.lwjgl.vulkan.awt;
 
+import org.lwjgl.awt.AWT;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.system.MemoryUtil;
 import org.lwjgl.system.jawt.JAWTWin32DrawingSurfaceInfo;

diff --git a/src/org/lwjgl/vulkan/awt/PlatformX11VKCanvas.java b/src/org/lwjgl/vulkan/awt/PlatformX11VKCanvas.java
@@ -1,5 +1,6 @@
 package org.lwjgl.vulkan.awt;
 
+import org.lwjgl.awt.AWT;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.system.jawt.JAWTX11DrawingSurfaceInfo;
 import org.lwjgl.vulkan.VkInstance;

diff --git a/test/org/lwjgl/vulkan/awt/SimpleDemo.java b/test/org/lwjgl/vulkan/awt/SimpleDemo.java
@@ -1,6 +1,7 @@
 package org.lwjgl.vulkan.awt;
 
 import org.lwjgl.PointerBuffer;
+import org.lwjgl.awt.AWT;
 import org.lwjgl.system.MemoryStack;
 import org.lwjgl.vulkan.KHRSurface;
 import org.lwjgl.vulkan.VkApplicationInfo;
@@ -59,7 +60,7 @@ private static VkInstance createInstance() {
     }
 
     public static void main(String[] args) throws AWTException {
-        if (!AWTVK.isPlatformSupported()) {
+        if (!AWT.isPlatformSupported()) {
             throw new RuntimeException("Platform not supported.");
         }