allemang.d/vulkan-zig
1
0
Fork 0
forked from mirror/vulkan-zig
Code Pull Requests Activity

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

Browse Source 
Update stage1 branch
This commit is contained in:
Robin Voetter
2022-10-06 20:25:24 +02:00
committed by GitHub
parent 84def477bf c42f540ce3
commit 2ccb04a619
4 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -27,7 +27,7 @@ jobs:
- name: Fetch Vulkan SDK - name: Fetch Vulkan SDK
run: | run: |
wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - 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 update
sudo apt install shaderc libglfw3 libglfw3-dev sudo apt install shaderc libglfw3 libglfw3-dev

4
build.zig
View File

@@ -59,9 +59,9 @@ pub const ResourceGenStep = struct {
const shader_out_path = self.shader_step.add(source, .{}); const shader_out_path = self.shader_step.add(source, .{});
var writer = self.resources.writer(); 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); renderPath(shader_out_path, writer);
writer.writeAll("\");\n") catch unreachable; writer.writeAll("\").*;\n") catch unreachable;
} }
fn make(step: *Step) !void { fn make(step: *Step) !void {

12
examples/triangle.zig
View File

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

2
generator/vulkan/render.zig
View File

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