diff --git a/pkg/glslang/c.zig b/pkg/glslang/c.zig index 97d9046a5..c00108463 100644 --- a/pkg/glslang/c.zig +++ b/pkg/glslang/c.zig @@ -1,4 +1,4 @@ -pub usingnamespace @cImport({ +pub const c = @cImport({ @cInclude("glslang/Include/glslang_c_interface.h"); @cInclude("glslang/Public/resource_limits_c.h"); }); diff --git a/pkg/glslang/init.zig b/pkg/glslang/init.zig index 33ddd081d..a865e9e79 100644 --- a/pkg/glslang/init.zig +++ b/pkg/glslang/init.zig @@ -1,4 +1,4 @@ -const c = @import("c.zig"); +const c = @import("c.zig").c; pub fn init() !void { if (c.glslang_initialize_process() == 0) return error.GlslangInitFailed; diff --git a/pkg/glslang/main.zig b/pkg/glslang/main.zig index 1a93e52be..2743650c6 100644 --- a/pkg/glslang/main.zig +++ b/pkg/glslang/main.zig @@ -1,8 +1,14 @@ -pub const c = @import("c.zig"); +const initpkg = @import("init.zig"); +const program = @import("program.zig"); +const shader = @import("shader.zig"); + +pub const c = @import("c.zig").c; pub const testing = @import("test.zig"); -pub usingnamespace @import("init.zig"); -pub usingnamespace @import("program.zig"); -pub usingnamespace @import("shader.zig"); + +pub const init = initpkg.init; +pub const finalize = initpkg.finalize; +pub const Program = program.Program; +pub const Shader = shader.Shader; test { @import("std").testing.refAllDecls(@This()); diff --git a/pkg/glslang/program.zig b/pkg/glslang/program.zig index 70d3c88cd..4af687cc5 100644 --- a/pkg/glslang/program.zig +++ b/pkg/glslang/program.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const c = @import("c.zig"); +const c = @import("c.zig").c; const testlib = @import("test.zig"); const Shader = @import("shader.zig").Shader; diff --git a/pkg/glslang/shader.zig b/pkg/glslang/shader.zig index 90e5e192f..36a09f34d 100644 --- a/pkg/glslang/shader.zig +++ b/pkg/glslang/shader.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const c = @import("c.zig"); +const c = @import("c.zig").c; const testlib = @import("test.zig"); pub const Shader = opaque {