forked from mirror/vulkan-zig
example: use addSystemCommand instead of shader compile step
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
const std = @import("std");
|
const std = @import("std");
|
||||||
|
|
||||||
const vkgen = @import("vulkan_zig");
|
const vkgen = @import("vulkan_zig");
|
||||||
const ShaderCompileStep = vkgen.ShaderCompileStep;
|
|
||||||
|
|
||||||
pub fn build(b: *std.Build) void {
|
pub fn build(b: *std.Build) void {
|
||||||
const target = b.standardTargetOptions(.{});
|
const target = b.standardTargetOptions(.{});
|
||||||
@@ -33,15 +32,27 @@ pub fn build(b: *std.Build) void {
|
|||||||
.root_source_file = vk_generate_cmd.addOutputFileArg("vk.zig"),
|
.root_source_file = vk_generate_cmd.addOutputFileArg("vk.zig"),
|
||||||
});
|
});
|
||||||
|
|
||||||
const shaders = ShaderCompileStep.create(
|
const vert_cmd = b.addSystemCommand(&.{
|
||||||
b,
|
"glslc",
|
||||||
.{ .real_path = "glslc" },
|
"--target-env=vulkan1.2",
|
||||||
&[_][]const u8{"--target-env=vulkan1.2"},
|
|
||||||
"-o",
|
"-o",
|
||||||
);
|
});
|
||||||
shaders.add("triangle_vert", "shaders/triangle.vert", .{});
|
const vert_spv = vert_cmd.addOutputFileArg("vert.spv");
|
||||||
shaders.add("triangle_frag", "shaders/triangle.frag", .{});
|
vert_cmd.addFileArg(b.path("shaders/triangle.vert"));
|
||||||
triangle_exe.root_module.addImport("shaders", shaders.getModule());
|
triangle_exe.root_module.addAnonymousImport("vertex_shader", .{
|
||||||
|
.root_source_file = vert_spv,
|
||||||
|
});
|
||||||
|
|
||||||
|
const frag_cmd = b.addSystemCommand(&.{
|
||||||
|
"glslc",
|
||||||
|
"--target-env=vulkan1.2",
|
||||||
|
"-o",
|
||||||
|
});
|
||||||
|
const frag_spv = frag_cmd.addOutputFileArg("frag.spv");
|
||||||
|
frag_cmd.addFileArg(b.path("shaders/triangle.frag"));
|
||||||
|
triangle_exe.root_module.addAnonymousImport("fragment_shader", .{
|
||||||
|
.root_source_file = frag_spv,
|
||||||
|
});
|
||||||
|
|
||||||
const triangle_run_cmd = b.addRunArtifact(triangle_exe);
|
const triangle_run_cmd = b.addRunArtifact(triangle_exe);
|
||||||
triangle_run_cmd.step.dependOn(b.getInstallStep());
|
triangle_run_cmd.step.dependOn(b.getInstallStep());
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
const std = @import("std");
|
const std = @import("std");
|
||||||
const vk = @import("vulkan");
|
const vk = @import("vulkan");
|
||||||
const c = @import("c.zig");
|
const c = @import("c.zig");
|
||||||
const shaders = @import("shaders");
|
|
||||||
const GraphicsContext = @import("graphics_context.zig").GraphicsContext;
|
const GraphicsContext = @import("graphics_context.zig").GraphicsContext;
|
||||||
const Swapchain = @import("swapchain.zig").Swapchain;
|
const Swapchain = @import("swapchain.zig").Swapchain;
|
||||||
const Allocator = std.mem.Allocator;
|
const Allocator = std.mem.Allocator;
|
||||||
|
|
||||||
|
const vert_spv align(@alignOf(u32)) = @embedFile("vertex_shader").*;
|
||||||
|
const frag_spv align(@alignOf(u32)) = @embedFile("fragment_shader").*;
|
||||||
|
|
||||||
const app_name = "vulkan-zig triangle example";
|
const app_name = "vulkan-zig triangle example";
|
||||||
|
|
||||||
const Vertex = struct {
|
const Vertex = struct {
|
||||||
@@ -362,14 +364,14 @@ fn createPipeline(
|
|||||||
render_pass: vk.RenderPass,
|
render_pass: vk.RenderPass,
|
||||||
) !vk.Pipeline {
|
) !vk.Pipeline {
|
||||||
const vert = try gc.dev.createShaderModule(&.{
|
const vert = try gc.dev.createShaderModule(&.{
|
||||||
.code_size = shaders.triangle_vert.len,
|
.code_size = vert_spv.len,
|
||||||
.p_code = @ptrCast(&shaders.triangle_vert),
|
.p_code = @ptrCast(&vert_spv),
|
||||||
}, null);
|
}, null);
|
||||||
defer gc.dev.destroyShaderModule(vert, null);
|
defer gc.dev.destroyShaderModule(vert, null);
|
||||||
|
|
||||||
const frag = try gc.dev.createShaderModule(&.{
|
const frag = try gc.dev.createShaderModule(&.{
|
||||||
.code_size = shaders.triangle_frag.len,
|
.code_size = frag_spv.len,
|
||||||
.p_code = @ptrCast(&shaders.triangle_frag),
|
.p_code = @ptrCast(&frag_spv),
|
||||||
}, null);
|
}, null);
|
||||||
defer gc.dev.destroyShaderModule(frag, null);
|
defer gc.dev.destroyShaderModule(frag, null);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user