From 7821e6aa3a0e8f0d8c3cdac2702921571778e7b7 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 15 Nov 2023 22:41:05 -0800 Subject: [PATCH] pkg/spirv-cross --- pkg/glslang/program.zig | 2 +- pkg/spirv-cross/build.zig | 4 ++-- pkg/spirv-cross/c.zig | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/glslang/program.zig b/pkg/glslang/program.zig index 4cfbc8fa1..03b4a2aeb 100644 --- a/pkg/glslang/program.zig +++ b/pkg/glslang/program.zig @@ -38,7 +38,7 @@ pub const Program = opaque { return c.glslang_program_SPIRV_get_ptr(@ptrCast(self)); } - pub fn sprivGetMessages(self: *Program) ![:0]const u8 { + pub fn spirvGetMessages(self: *Program) ![:0]const u8 { const ptr = c.glslang_program_SPIRV_get_messages(@ptrCast(self)); return std.mem.sliceTo(ptr, 0); } diff --git a/pkg/spirv-cross/build.zig b/pkg/spirv-cross/build.zig index 753aa4931..c603bf6ca 100644 --- a/pkg/spirv-cross/build.zig +++ b/pkg/spirv-cross/build.zig @@ -4,7 +4,7 @@ pub fn build(b: *std.Build) !void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); - _ = b.addModule("spirv-cross", .{ .source_file = .{ .path = "main.zig" } }); + _ = b.addModule("spirv_cross", .{ .source_file = .{ .path = "main.zig" } }); const upstream = b.dependency("spirv_cross", .{}); const lib = try buildSpirvCross(b, upstream, target, optimize); @@ -34,7 +34,7 @@ fn buildSpirvCross( optimize: std.builtin.OptimizeMode, ) !*std.Build.Step.Compile { const lib = b.addStaticLibrary(.{ - .name = "spirv-cross", + .name = "spirv_cross", .target = target, .optimize = optimize, }); diff --git a/pkg/spirv-cross/c.zig b/pkg/spirv-cross/c.zig index 6ca10e1f2..c3140ded3 100644 --- a/pkg/spirv-cross/c.zig +++ b/pkg/spirv-cross/c.zig @@ -1,3 +1,3 @@ pub usingnamespace @cImport({ - @cInclude("spriv_cross/external_interface.h"); + @cInclude("spirv_cross/external_interface.h"); });