Merge pull request #641 from evo-lua/update-glfw3wgpu-submodule

Reintroduce glfw3wgpu as a git submodule

.gitmodules

@@ -112,4 +112,9 @@
 	path = deps/Tencent/rapidjson
 	url = https://github.com/Tencent/rapidjson
 	ignore = dirty
-	branch = master
+	branch = master
+[submodule "glfw3webgpu"]
+	path = deps/eliemichel/glfw3webgpu
+	url = https://github.com/eliemichel/glfw3webgpu
+	ignore = dirty
+	branch = main

Runtime/Bindings/FFI/glfw/glfw.lua

@@ -34,7 +34,7 @@ struct static_glfw_exports_table {
 	const char* (*glfw_version)(void);
 	int (*glfw_find_constant)(const char* name);
 
-	WGPUSurface (*glfw_get_wgpu_surface)(WGPUInstance instance, GLFWwindow* window);
+	WGPUSurface (*glfw_create_window_wgpu_surface)(WGPUInstance instance, GLFWwindow* window);
 
 	int (*glfw_init)(void);
 	void (*glfw_terminate)(void);

Runtime/Bindings/FFI/glfw/glfw_exports.h

@@ -2,7 +2,7 @@ struct static_glfw_exports_table {
 	const char* (*glfw_version)(void);
 	int (*glfw_find_constant)(const char* name);
 
-	WGPUSurface (*glfw_get_wgpu_surface)(WGPUInstance instance, GLFWwindow* window);
+	WGPUSurface (*glfw_create_window_wgpu_surface)(WGPUInstance instance, GLFWwindow* window);
 
 	int (*glfw_init)(void);
 	void (*glfw_terminate)(void);

Runtime/Bindings/FFI/glfw/glfw_ffi.cpp

@@ -230,7 +230,7 @@ namespace glfw_ffi {
 		exports.glfw_version = glfw_version;
 		exports.glfw_find_constant = glfw_find_constant;
 
-		exports.glfw_get_wgpu_surface = glfwGetWGPUSurface;
+		exports.glfw_create_window_wgpu_surface = glfwCreateWindowWGPUSurface;
 
 		exports.glfw_init = glfwInit;
 		exports.glfw_terminate = glfwTerminate;

Runtime/Bindings/FFI/wgpu/webgpu/webgpu.h

@@ -0,0 +1,3 @@
+// Workaround for the hardcoded header path in glfw3wgpu - remove later
+
+#include <webgpu.h>

Tests/BDD/glfw-library.spec.lua

@@ -6,7 +6,7 @@ describe("glfw", function()
 			local exportedApiSurface = {
 				"glfw_version",
 				"glfw_find_constant",
-				"glfw_get_wgpu_surface",
+				"glfw_create_window_wgpu_surface",
 				"glfw_init",
 				"glfw_terminate",
 				"glfw_poll_events",

Tests/BDD/runtime-library.spec.lua

@@ -68,7 +68,7 @@ describe("runtime", function()
 			assertSubmoduleVersion(runtime.submodules["deps/zhaog/lua-openssl"])
 			assertSubmoduleVersion(runtime.submodules["deps/Tencent/rapidjson"])
 
-			assertEquals(table.count(runtime.submodules), 23)
+			assertEquals(table.count(runtime.submodules), 24)
 		end)
 	end)
 end)

Tests/Integration/glfw-webgpu-surface.lua

@@ -26,7 +26,7 @@ local window = glfw.bindings.glfw_create_window(640, 480, "WebGPU Surface Test",
 assert(window, "Failed to create window")
 
 print("Requesting adapter...")
-local surface = glfw.bindings.glfw_get_wgpu_surface(instance, window)
+local surface = glfw.bindings.glfw_create_window_wgpu_surface(instance, window)
 assert(surface, "Failed to create WebGPU surface")
 
 local adapterOpts = ffi.new("WGPURequestAdapterOptions")

Tests/Integration/rml-glfw-wgpu-setup.lua

@@ -32,7 +32,7 @@ local function createDevice(window)
 		error("Could not initialize WebGPU!")
 	end
 
-	local surface = glfw.bindings.glfw_get_wgpu_surface(instance, window)
+	local surface = glfw.bindings.glfw_create_window_wgpu_surface(instance, window)
 	assert(surface, "Failed to create WebGPU surface")
 
 	local adapterOptions = ffi.new("WGPURequestAdapterOptions")