Fix triangle example compilation

chances · Apr 9, 2024 · 0b83ed1 · 0b83ed1
1 parent 47c4973
commit 0b83ed1
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 51 deletions.
diff --git a/examples/triangle/assets/shaders/triangle.fs.glsl b/examples/triangle/assets/shaders/triangle.fs.glsl
diff --git a/examples/triangle/assets/shaders/triangle.vs.glsl b/examples/triangle/assets/shaders/triangle.vs.glsl
diff --git a/examples/triangle/assets/shaders/triangle.wgsl b/examples/triangle/assets/shaders/triangle.wgsl
@@ -0,0 +1,14 @@
+struct Fragment {
+  @builtin(position) pos: vec4f,
+  color: vec4f
+}
+
+@vertex
+fn vs(@location(0) pos: vec3f, @location(1) color: vec4f) -> Fragment {
+  return Fragment(pos, color);
+}
+
+@fragment
+fn fs(frag: Fragment) -> @location(0) vec4f {
+  return frag.color;
+}
diff --git a/examples/triangle/dub.json b/examples/triangle/dub.json
@@ -5,23 +5,16 @@
     "Chance Snow"
   ],
   "license": "BSD 3-clause",
-  "copyright": "Copyright © 2020, Chance Snow",
+  "copyright": "Copyright © 2020-2024, Chance Snow",
   "targetType": "executable",
   "targetPath": "../../bin",
-  "systemDependencies": "glfw >= 3.2.0",
   "dependencies": {
     "teraflop": {
       "path": "../../"
     }
   },
-  "preBuildCommands": [
-    "glslc assets/shaders/triangle.vs.glsl -o assets/shaders/triangle.vs.spv",
-    "glslc assets/shaders/triangle.fs.glsl -o assets/shaders/triangle.fs.spv"
-  ],
+  "stringImportPaths": ["."],
   "postBuildCommands-linux": [
     "patchelf --set-rpath '$$ORIGIN' $PACKAGE_DIR/../../bin/triangle"
-  ],
-  "lflags-linux": [
-    "-L../../lib/glfw-3.3.2/src"
   ]
 }
diff --git a/examples/triangle/dub.selections.json b/examples/triangle/dub.selections.json
@@ -1,15 +1,14 @@
 {
 	"fileVersion": 1,
 	"versions": {
-		"bindbc-glfw": "1.0.1",
-		"bindbc-loader": "1.0.1",
-		"eventcore": "0.9.20",
+		"bindbc-glfw": "1.0.3",
+		"bindbc-loader": "1.0.3",
+		"eventcore": "0.9.30",
 		"gfm": "8.0.6",
-		"intel-intrinsics": "1.10.2",
+		"intel-intrinsics": "1.11.18",
 		"libasync": "0.8.6",
-		"memutils": "1.0.4",
+		"memutils": "1.0.10",
 		"taggedalgebraic": "0.11.22",
-		"teraflop": {"path":"../../"},
-		"wgpu-d": "0.1.0+commit.12.g2aa4be8"
+		"wgpu-d": {"version":"8c5deeed965fba2903565d4272d5b3146d4f4b5f","repository":"git+https://github.com/chances/wgpu-d.git"}
 	}
 }
diff --git a/examples/triangle/source/app.d b/examples/triangle/source/app.d
@@ -36,8 +36,8 @@ private final class Triangle : Game {
     this.add(System.from!exitOnEscape);
 
     auto shaders = [
-      new Shader(ShaderStage.vertex, "examples/triangle/assets/shaders/triangle.vs.spv", SourceLanguage.spirv),
-      new Shader(ShaderStage.fragment, "examples/triangle/assets/shaders/triangle.fs.spv", SourceLanguage.spirv)
+      new Shader(ShaderStage.vertex, import("assets/shaders/triangle.wgsl")),
+      new Shader(ShaderStage.fragment, import("assets/shaders/triangle.wgsl"))
     ];
 
     world.spawn(Material(shaders, No.depthTest), Mesh!VertexPosColor([

diff --git a/source/ecs/components.d b/source/ecs/components.d
@@ -86,10 +86,10 @@ struct ObservableFile {
   import std.typecons : Flag, No, Yes;
   import teraflop.async : Event;
 
-  private File* _file;
+  private File* _file = null;
 
   /// Whether this file is being watched for changes.
-  const bool hotReload;
+  const bool hotReload = false;
 
   /// Fired if the file is being actively watched and when the file's contents change.
   Event!(const(ubyte)[]) onChanged;
@@ -107,7 +107,9 @@ struct ObservableFile {
   /// Instantiate a static file given its in-memory `contents`.
   package (teraflop) this(string contents) {
     import std.conv : to;
-    this(contents.to!(const ubyte[]));
+    import std.string : representation;
+
+    this(contents.representation.to!(const ubyte[]));
   }
   /// Instantiate a static file given its in-memory `contents`.
   package (teraflop) this(const(ubyte)[] contents) {

diff --git a/source/game.d b/source/game.d
@@ -118,17 +118,16 @@ abstract class Game {
     import teraflop.platform.window : initGlfw, terminateGlfw;
     import wgpu.api : PowerPreference;
 
+    this.instance = Instance.create();
+
     // Setup main window
-    if (!initGlfw()) {
-      return;
-    }
+    if (!initGlfw()) return;
     scope(exit) terminateGlfw();
 
     windows_ ~= _mainWindow = new Window(instance, name);
     if (!_mainWindow.valid) return;
 
     // Setup graphics resources
-    this.instance = Instance.create();
     // TODO: Select `PowerPreference.lowPower` on laptops and whatnot
     this.adapter = instance.requestAdapter(_mainWindow.surface, PowerPreference.highPerformance);
     assert(adapter.ready);

diff --git a/source/platform/window.d b/source/platform/window.d
@@ -27,7 +27,6 @@ class Window : InputNode, Resource {
   private GLFWwindow* window;
   private Device device_;
   private Surface surface_;
-  private TextureFormat swapChainFormat_;
   private const EventLoop eventLoop_;
   private string title_;
   private WindowData data;
@@ -56,7 +55,7 @@ class Window : InputNode, Resource {
     glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); // Graphics are handled by wgpu
 
     window = glfwCreateWindow(width, height, toStringz(title), null, null);
-    if (!valid) {
+    if (window is null) {
       errorCallback(0, toStringz("Failed to initialize a new GLFW Window"));
       return;
     }
@@ -295,7 +294,7 @@ class Window : InputNode, Resource {
 
     this.device_ = device;
 
-    this.swapChainFormat_ = surface.preferredFormat(adapter);
+    auto surfaceFormat = surface.preferredFormat(adapter);
     surface.configure(
       device, surfaceSize.width, surfaceSize.height, surfaceFormat,
       TextureUsage.renderAttachment,