diff --git a/pkg/opengl/Buffer.zig b/pkg/opengl/Buffer.zig --- a/pkg/opengl/Buffer.zig +++ b/pkg/opengl/Buffer.zig @@ -1,7 +1,7 @@ const Buffer = @This(); const std = @import("std"); -const c = @import("c.zig"); +const c = @import("c.zig").c; const errors = @import("errors.zig"); const glad = @import("glad.zig"); diff --git a/pkg/opengl/Framebuffer.zig b/pkg/opengl/Framebuffer.zig --- a/pkg/opengl/Framebuffer.zig +++ b/pkg/opengl/Framebuffer.zig @@ -1,7 +1,7 @@ const Framebuffer = @This(); const std = @import("std"); -const c = @import("c.zig"); +const c = @import("c.zig").c; const errors = @import("errors.zig"); const glad = @import("glad.zig"); const Texture = @import("Texture.zig"); diff --git a/pkg/opengl/Program.zig b/pkg/opengl/Program.zig --- a/pkg/opengl/Program.zig +++ b/pkg/opengl/Program.zig @@ -4,7 +4,7 @@ const assert = std.debug.assert; const log = std.log.scoped(.opengl); -const c = @import("c.zig"); +const c = @import("c.zig").c; const Shader = @import("Shader.zig"); const errors = @import("errors.zig"); const glad = @import("glad.zig"); diff --git a/pkg/opengl/Shader.zig b/pkg/opengl/Shader.zig --- a/pkg/opengl/Shader.zig +++ b/pkg/opengl/Shader.zig @@ -4,7 +4,7 @@ const assert = std.debug.assert; const log = std.log.scoped(.opengl); -const c = @import("c.zig"); +const c = @import("c.zig").c; const errors = @import("errors.zig"); const glad = @import("glad.zig"); diff --git a/pkg/opengl/Texture.zig b/pkg/opengl/Texture.zig --- a/pkg/opengl/Texture.zig +++ b/pkg/opengl/Texture.zig @@ -1,7 +1,7 @@ const Texture = @This(); const std = @import("std"); -const c = @import("c.zig"); +const c = @import("c.zig").c; const errors = @import("errors.zig"); const glad = @import("glad.zig"); diff --git a/pkg/opengl/VertexArray.zig b/pkg/opengl/VertexArray.zig --- a/pkg/opengl/VertexArray.zig +++ b/pkg/opengl/VertexArray.zig @@ -1,6 +1,6 @@ const VertexArray = @This(); -const c = @import("c.zig"); +const c = @import("c.zig").c; const glad = @import("glad.zig"); const errors = @import("errors.zig"); diff --git a/pkg/opengl/c.zig b/pkg/opengl/c.zig --- a/pkg/opengl/c.zig +++ b/pkg/opengl/c.zig @@ -1,3 +1,3 @@ -pub usingnamespace @cImport({ +pub const c = @cImport({ @cInclude("glad/gl.h"); }); diff --git a/pkg/opengl/draw.zig b/pkg/opengl/draw.zig --- a/pkg/opengl/draw.zig +++ b/pkg/opengl/draw.zig @@ -1,4 +1,4 @@ -const c = @import("c.zig"); +const c = @import("c.zig").c; const errors = @import("errors.zig"); const glad = @import("glad.zig"); diff --git a/pkg/opengl/errors.zig b/pkg/opengl/errors.zig --- a/pkg/opengl/errors.zig +++ b/pkg/opengl/errors.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const c = @import("c.zig"); +const c = @import("c.zig").c; const glad = @import("glad.zig"); pub const Error = error{ diff --git a/pkg/opengl/extensions.zig b/pkg/opengl/extensions.zig --- a/pkg/opengl/extensions.zig +++ b/pkg/opengl/extensions.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const c = @import("c.zig"); +const c = @import("c.zig").c; const errors = @import("errors.zig"); const glad = @import("glad.zig"); diff --git a/pkg/opengl/glad.zig b/pkg/opengl/glad.zig --- a/pkg/opengl/glad.zig +++ b/pkg/opengl/glad.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const c = @import("c.zig"); +const c = @import("c.zig").c; pub const Context = c.GladGLContext; diff --git a/pkg/opengl/main.zig b/pkg/opengl/main.zig --- a/pkg/opengl/main.zig +++ b/pkg/opengl/main.zig @@ -11,10 +11,8 @@ //! WARNING: Lots of performance improvements that we can make with Zig //! comptime help. I'm deferring this until later but have some fun ideas. -pub const c = @import("c.zig"); +pub const c = @import("c.zig").c; pub const glad = @import("glad.zig"); -pub usingnamespace @import("draw.zig"); - pub const ext = @import("extensions.zig"); pub const Buffer = @import("Buffer.zig"); pub const Framebuffer = @import("Framebuffer.zig"); @@ -22,3 +20,16 @@ pub const Shader = @import("Shader.zig"); pub const Texture = @import("Texture.zig"); pub const VertexArray = @import("VertexArray.zig"); + +const draw = @import("draw.zig"); + +pub const blendFunc = draw.blendFunc; +pub const clear = draw.clear; +pub const clearColor = draw.clearColor; +pub const drawArrays = draw.drawArrays; +pub const drawElements = draw.drawElements; +pub const drawElementsInstanced = draw.drawElementsInstanced; +pub const enable = draw.enable; +pub const frontFace = draw.frontFace; +pub const pixelStore = draw.pixelStore; +pub const viewport = draw.viewport;