Merge pull request #57 from ashpil/zig-stage1-compat

Update stage1 branch

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Fetch Vulkan SDK
       run: |
         wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
-        sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.216-focal.list https://packages.lunarg.com/vulkan/1.3.216/lunarg-vulkan-1.3.216-focal.list
+        sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.224-focal.list https://packages.lunarg.com/vulkan/1.3.224/lunarg-vulkan-1.3.224-focal.list
         sudo apt update
         sudo apt install shaderc libglfw3 libglfw3-dev
 

build.zig

@@ -59,9 +59,9 @@ pub const ResourceGenStep = struct {
         const shader_out_path = self.shader_step.add(source, .{});
         var writer = self.resources.writer();
 
-        writer.print("pub const {s} = @embedFile(\"", .{name}) catch unreachable;
+        writer.print("pub const {s} align(@alignOf(u32)) = @embedFile(\"", .{name}) catch unreachable;
         renderPath(shader_out_path, writer);
-        writer.writeAll("\");\n") catch unreachable;
+        writer.writeAll("\").*;\n") catch unreachable;
     }
 
     fn make(step: *Step) !void {

examples/triangle.zig

@@ -236,13 +236,6 @@ fn createCommandBuffers(
     const cmdbufs = try allocator.alloc(vk.CommandBuffer, framebuffers.len);
     errdefer allocator.free(cmdbufs);
 
-    _ = pipeline;
-    _ = render_pass;
-    _ = extent;
-    _ = buffer;
-    _ = pool;
-    _ = gc;
-
     try gc.vkd.allocateCommandBuffers(gc.dev, &.{
         .command_pool = pool,
         .level = .primary,
@@ -269,7 +262,6 @@ fn createCommandBuffers(
     };
 
     for (cmdbufs) |cmdbuf, i| {
-        _ = i;
         try gc.vkd.beginCommandBuffer(cmdbuf, &.{
             .flags = .{},
             .p_inheritance_info = null,
@@ -387,14 +379,14 @@ fn createPipeline(
     const vert = try gc.vkd.createShaderModule(gc.dev, &.{
         .flags = .{},
         .code_size = resources.triangle_vert.len,
-        .p_code = @ptrCast([*]const u32, resources.triangle_vert),
+        .p_code = @ptrCast([*]const u32, &resources.triangle_vert),
     }, null);
     defer gc.vkd.destroyShaderModule(gc.dev, vert, null);
 
     const frag = try gc.vkd.createShaderModule(gc.dev, &.{
         .flags = .{},
         .code_size = resources.triangle_frag.len,
-        .p_code = @ptrCast([*]const u32, resources.triangle_frag),
+        .p_code = @ptrCast([*]const u32, &resources.triangle_frag),
     }, null);
     defer gc.vkd.destroyShaderModule(gc.dev, frag, null);
 

generator/vulkan/render.zig

@@ -1081,7 +1081,7 @@ fn Renderer(comptime WriterType: type) type {
                 \\                .Struct = .{{
                 \\                    .layout = .Auto,
                 \\                    .fields = &fields,
-                \\                    .decls = &[_]std.builtin.TypeInfo.Declaration{{}},
+                \\                    .decls = &[_]std.builtin.Type.Declaration{{}},
                 \\                    .is_tuple = false,
                 \\                }},
                 \\            }});