kbz_8/NZigSL
1
0
Fork 0
Code Issues Pull Requests actions.actions Packages Projects Releases Wiki Activity

big rework towards Zig 0.15

Browse Source
This commit is contained in:
Kbz-8
2025-10-24 17:31:36 +02:00
parent dcc40e46b9
commit f52052da90
15 changed files with 439 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
build.zig
View File

@@ -3,10 +3,7 @@ const std = @import("std");
const Build = std.Build;
const Step = std.Build.Step;
pub const Libsource = enum {
source,
prebuild
};
pub const Libsource = enum { source, prebuild };
// based on ziglua's build.zig
@@ -28,24 +25,25 @@ pub fn build(b: *Build) void {
}
// Zig module
const nzslzig = b.addModule("nzslzig", .{
.root_source_file = .{ .path = "src/lib.zig" },
});
const docs = b.addStaticLibrary(.{
.name = "nzslzig",
.root_source_file = .{ .path = "src/lib.zig" },
const nzigsl = b.addModule("nzigsl", .{
.target = target,
.optimize = optimize,
.root_source_file = b.path("src/lib.zig"),
});
// Expose build configuration to the nzslzig module
const docs = b.addLibrary(.{
.name = "nzigsl",
.root_module = nzigsl,
.linkage = .static,
});
// Expose build configuration to the nzigsl module
const config = b.addOptions();
config.addOption(Libsource, "libsource", libsource);
nzslzig.addOptions("config", config);
nzigsl.addOptions("config", config);
nzsldep: {
const upstream = b.lazyDependency(if (libsource == .source) "nzsl_source" else break :nzsldep , .{}) orelse break :nzsldep;
const upstream = b.lazyDependency(if (libsource == .source) "nzsl" else break :nzsldep, .{}) orelse break :nzsldep;
const nazaraUtils = b.lazyDependency("NazaraUtils", .{}) orelse break :nzsldep;
const frozen = b.lazyDependency("frozen", .{}) orelse break :nzsldep;
const fmt = b.lazyDependency("fmt", .{}) orelse break :nzsldep;
@@ -53,16 +51,16 @@ pub fn build(b: *Build) void {
const fast_float = b.lazyDependency("fast_float", .{}) orelse break :nzsldep;
const lib = switch (libsource) {
.source => buildNzsl(b, target, optimize, upstream, nazaraUtils, frozen, fmt, ordered_map, fast_float, shared),
else => unreachable,
.source => buildNzsl(b, target, optimize, upstream, nazaraUtils, frozen, fmt, ordered_map, fast_float, shared),
else => unreachable,
};
// Expose the Nzsl artifact
b.installArtifact(lib);
//nzslzig.addSystemIncludePath(upstream.path("include"));
//nzigsl.addSystemIncludePath(upstream.path("include"));
nzslzig.linkLibrary(lib);
nzigsl.linkLibrary(lib);
docs.linkLibrary(lib);
}
@@ -74,11 +72,13 @@ pub fn build(b: *Build) void {
for (examples) |example| {
const exe = b.addExecutable(.{
.name = example[0],
.root_source_file = .{ .path = example[1] },
.target = target,
.optimize = optimize,
.root_module = b.createModule(.{
.target = target,
.optimize = optimize,
.root_source_file = b.path(example[1]),
}),
});
exe.root_module.addImport("nzslzig", nzslzig);
exe.root_module.addImport("nzigsl", nzigsl);
const artifact = b.addInstallArtifact(exe, .{});
const exe_step = b.step(b.fmt("install-example-{s}", .{example[0]}), b.fmt("Install {s} example", .{example[0]}));
@@ -93,7 +93,7 @@ pub fn build(b: *Build) void {
}
docs.root_module.addOptions("config", config);
docs.root_module.addImport("nzslzig", nzslzig);
docs.root_module.addImport("nzigsl", nzigsl);
const install_docs = b.addInstallDirectory(.{
.source_dir = docs.getEmittedDocs(),
@@ -106,16 +106,14 @@ pub fn build(b: *Build) void {
}
fn buildNzsl(b: *Build, target: Build.ResolvedTarget, optimize: std.builtin.OptimizeMode, upstream: *Build.Dependency, nazaraUtils: *Build.Dependency, frozen: *Build.Dependency, ordered_map: *Build.Dependency, fast_float: *Build.Dependency, fmt: *Build.Dependency, shared: bool) *Step.Compile {
const lib_opts = .{
const lib = b.addLibrary(.{
.name = "nzsl",
.target = target,
.optimize = optimize,
};
const lib = if (shared)
b.addSharedLibrary(lib_opts)
else
b.addStaticLibrary(lib_opts);
.root_module = b.createModule(.{
.target = target,
.optimize = optimize,
}),
.linkage = if (shared) .dynamic else .static,
});
lib.addSystemIncludePath(upstream.path("include"));
lib.addSystemIncludePath(upstream.path("src"));
@@ -128,7 +126,9 @@ fn buildNzsl(b: *Build, target: Build.ResolvedTarget, optimize: std.builtin.Opti
const flags = [_][]const u8{
if (shared)
"-DCNZSL_DYNAMIC" else "-DCNZSL_STATIC",
"-DCNZSL_DYNAMIC"
else
"-DCNZSL_STATIC",
if (shared) "-DNZSL_DYNAMIC" else "-DNZSL_STATIC",
"-DCNZSL_BUILD",
"-DNZSL_BUILD",
@@ -159,63 +159,83 @@ fn buildNzsl(b: *Build, target: Build.ResolvedTarget, optimize: std.builtin.Opti
lib.linkLibCpp();
lib.installHeader(upstream.path("include/CNZSL/CNZSL.h"), "CNZSL/CNZSL.h");
lib.installHeader(upstream.path("include/CNZSL/Config.h"), "CNZSL/Config.h");
lib.installHeader(upstream.path("include/CNZSL/DebugLevel.h"), "CNZSL/DebugLevel.h");
lib.installHeader(upstream.path("include/CNZSL/GlslWriter.h"), "CNZSL/GlslWriter.h");
lib.installHeader(upstream.path("include/CNZSL/LangWriter.h"), "CNZSL/LangWriter.h");
lib.installHeader(upstream.path("include/CNZSL/Module.h"), "CNZSL/Module.h");
lib.installHeader(upstream.path("include/CNZSL/Parser.h"), "CNZSL/Parser.h");
lib.installHeader(upstream.path("include/CNZSL/ShaderStageType.h"), "CNZSL/ShaderStageType.h");
lib.installHeader(upstream.path("include/CNZSL/SpirvWriter.h"), "CNZSL/SpirvWriter.h");
lib.installHeader(upstream.path("include/CNZSL/WriterStates.h"), "CNZSL/WriterStates.h");
lib.installHeader(upstream.path("include/CNZSL/ShaderStageType.h"), "CNZSL/ShaderStageType.h");
lib.installHeader(upstream.path("include/CNZSL/Serializer.h"), "CNZSL/Serializer.h");
lib.installHeader(upstream.path("include/CNZSL/Parser.h"), "CNZSL/Parser.h");
lib.installHeader(upstream.path("include/CNZSL/Module.h"), "CNZSL/Module.h");
lib.installHeader(upstream.path("include/CNZSL/LangWriter.h"), "CNZSL/LangWriter.h");
lib.installHeader(upstream.path("include/CNZSL/GlslWriter.h"), "CNZSL/GlslWriter.h");
lib.installHeader(upstream.path("include/CNZSL/DebugLevel.h"), "CNZSL/DebugLevel.h");
lib.installHeader(upstream.path("include/CNZSL/Config.h"), "CNZSL/Config.h");
lib.installHeader(upstream.path("include/CNZSL/CNZSL.h"), "CNZSL/CNZSL.h");
lib.installHeader(upstream.path("include/CNZSL/BackendParameters.h"), "CNZSL/BackendParameters.h");
lib.installHeader(upstream.path("include/CNZSL/FilesystemModuleResolver.h"), "CNZSL/FilesystemModuleResolver.h");
return lib;
}
const nzsl_source_files_list = [_][]const u8{
"src/NZSL/Ast/AstSerializer.cpp",
"src/NZSL/Ast/Cloner.cpp",
"src/NZSL/Ast/ConstantPropagationVisitor.cpp",
"src/NZSL/Ast/ConstantPropagationVisitor_BinaryArithmetics.cpp",
"src/NZSL/Ast/ConstantPropagationVisitor_BinaryComparison.cpp",
"src/NZSL/Ast/ConstantValue.cpp",
"src/NZSL/Ast/DependencyCheckerVisitor.cpp",
"src/NZSL/Ast/EliminateUnusedPassVisitor.cpp",
"src/NZSL/Ast/ExportVisitor.cpp",
"src/NZSL/Ast/ExpressionType.cpp",
"src/NZSL/Ast/ExpressionVisitor.cpp",
"src/NZSL/Ast/ExpressionVisitorExcept.cpp",
"src/NZSL/Ast/IndexRemapperVisitor.cpp",
"src/NZSL/Ast/Nodes.cpp",
"src/NZSL/Ast/RecursiveVisitor.cpp",
"src/NZSL/Ast/ReflectVisitor.cpp",
"src/NZSL/Ast/SanitizeVisitor.cpp",
"src/NZSL/Ast/StatementVisitor.cpp",
"src/NZSL/Ast/StatementVisitorExcept.cpp",
"src/NZSL/Ast/Utils.cpp",
"src/NZSL/FilesystemModuleResolver.cpp",
"src/NZSL/GlslWriter.cpp",
"src/NZSL/Lang/Errors.cpp",
"src/NZSL/LangWriter.cpp",
"src/NZSL/Lexer.cpp",
"src/NZSL/ModuleResolver.cpp",
"src/NZSL/Parser.cpp",
"src/NZSL/Serializer.cpp",
"src/NZSL/ShaderWriter.cpp",
"src/NZSL/SpirV/SpirvAstVisitor.cpp",
"src/NZSL/SpirV/SpirvConstantCache.cpp",
"src/NZSL/SpirV/SpirvData.cpp",
"src/NZSL/SpirV/SpirvDecoder.cpp",
"src/NZSL/SpirV/SpirvExpressionLoad.cpp",
"src/NZSL/SpirV/SpirvExpressionStore.cpp",
"src/NZSL/SpirV/SpirvPrinter.cpp",
"src/NZSL/SpirV/SpirvSectionBase.cpp",
"src/NZSL/SpirvWriter.cpp",
"src/CNZSL/GlslWriter.cpp",
"src/CNZSL/LangWriter.cpp",
"src/CNZSL/Module.cpp",
"src/CNZSL/Parser.cpp",
"src/NZSL/SpirV/SpirvSectionBase.cpp",
"src/NZSL/SpirV/SpirvPrinter.cpp",
"src/NZSL/SpirV/SpirvExpressionStore.cpp",
"src/NZSL/SpirV/SpirvExpressionLoad.cpp",
"src/NZSL/SpirV/SpirvDecoder.cpp",
"src/NZSL/SpirV/SpirvData.cpp",
"src/NZSL/SpirV/SpirvConstantCache.cpp",
"src/NZSL/SpirV/SpirvAstVisitor.cpp",
"src/NZSL/Serializer.cpp",
"src/NZSL/Parser.cpp",
"src/NZSL/ModuleResolver.cpp",
"src/NZSL/Lexer.cpp",
"src/NZSL/LangWriter.cpp",
"src/NZSL/Lang/Version.cpp",
"src/NZSL/Lang/Errors.cpp",
"src/NZSL/GlslWriter.cpp",
"src/NZSL/FilesystemModuleResolver.cpp",
"src/NZSL/Ast/Utils.cpp",
"src/NZSL/Ast/Transformations/ValidationTransformer.cpp",
"src/NZSL/Ast/Transformations/TransformerContext.cpp",
"src/NZSL/Ast/Transformations/Transformer.cpp",
"src/NZSL/Ast/Transformations/SwizzleTransformer.cpp",
"src/NZSL/Ast/Transformations/StructAssignmentTransformer.cpp",
"src/NZSL/Ast/Transformations/ResolveTransformer.cpp",
"src/NZSL/Ast/Transformations/MatrixTransformer.cpp",
"src/NZSL/Ast/Transformations/LoopUnrollTransformer.cpp",
"src/NZSL/Ast/Transformations/LiteralTransformer.cpp",
"src/NZSL/Ast/Transformations/IndexRemapperTransformer.cpp",
"src/NZSL/Ast/Transformations/IdentifierTransformer.cpp",
"src/NZSL/Ast/Transformations/ForToWhileTransformer.cpp",
"src/NZSL/Ast/Transformations/EliminateUnusedTransformer.cpp",
"src/NZSL/Ast/Transformations/ConstantRemovalTransformer.cpp",
"src/NZSL/Ast/Transformations/ConstantPropagationTransformer_Binary.cpp",
"src/NZSL/Ast/Transformations/ConstantPropagationTransformer.cpp",
"src/NZSL/Ast/Transformations/CompoundAssignmentTransformer.cpp",
"src/NZSL/Ast/Transformations/BranchSplitterTransformer.cpp",
"src/NZSL/Ast/Transformations/BindingResolverTransformer.cpp",
"src/NZSL/Ast/Transformations/AliasTransformer.cpp",
"src/NZSL/Ast/StatementVisitorExcept.cpp",
"src/NZSL/Ast/StatementVisitor.cpp",
"src/NZSL/Ast/ReflectVisitor.cpp",
"src/NZSL/Ast/RecursiveVisitor.cpp",
"src/NZSL/Ast/Nodes.cpp",
"src/NZSL/Ast/IdentifierList.cpp",
"src/NZSL/Ast/ExpressionVisitorExcept.cpp",
"src/NZSL/Ast/ExpressionVisitor.cpp",
"src/NZSL/Ast/ExpressionType.cpp",
"src/NZSL/Ast/ExportVisitor.cpp",
"src/NZSL/Ast/DependencyCheckerVisitor.cpp",
"src/NZSL/Ast/ConstantValue.cpp",
"src/NZSL/Ast/Cloner.cpp",
"src/NZSL/Ast/AstSerializer.cpp",
"src/NZSL/Archive.cpp",
"src/CNZSL/SpirvWriter.cpp",
"src/CNZSL/WriterStates.cpp",
};
"src/CNZSL/Serializer.cpp",
"src/CNZSL/Parser.cpp",
"src/CNZSL/Module.cpp",
"src/CNZSL/LangWriter.cpp",
"src/CNZSL/GlslWriter.cpp",
"src/CNZSL/FilesystemModuleResolver.cpp",
"src/CNZSL/BackendParameters.cpp",
};