From f13ea7cace0adeef12285ed13e621e25822808bd Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 16 Aug 2024 15:28:22 -0700
Subject: [PATCH] pkg/opengl: yeet usingns

---
 pkg/opengl/Buffer.zig      |  2 +-
 pkg/opengl/Framebuffer.zig |  2 +-
 pkg/opengl/Program.zig     |  2 +-
 pkg/opengl/Shader.zig      |  2 +-
 pkg/opengl/Texture.zig     |  2 +-
 pkg/opengl/VertexArray.zig |  2 +-
 pkg/opengl/c.zig           |  2 +-
 pkg/opengl/draw.zig        |  2 +-
 pkg/opengl/errors.zig      |  2 +-
 pkg/opengl/extensions.zig  |  2 +-
 pkg/opengl/glad.zig        |  2 +-
 pkg/opengl/main.zig        | 17 ++++++++++++++---
 12 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/pkg/opengl/Buffer.zig b/pkg/opengl/Buffer.zig
index a8ba099d3..6b6a95a5d 100644
--- 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
index 8ab07a238..c5d659f98 100644
--- 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
index 824687e83..ee77582c1 100644
--- a/pkg/opengl/Program.zig
+++ b/pkg/opengl/Program.zig
@@ -4,7 +4,7 @@ const std = @import("std");
 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
index beaae9e94..8973ace30 100644
--- a/pkg/opengl/Shader.zig
+++ b/pkg/opengl/Shader.zig
@@ -4,7 +4,7 @@ const std = @import("std");
 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
index 87f3ca102..4cd1cf9f9 100644
--- 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
index 4071c3a2a..4a6a37576 100644
--- 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
index 8f4a0f22f..fc95ee94c 100644
--- 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
index ea6b63103..866511c32 100644
--- 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
index 86639a53a..ec0464604 100644
--- 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
index ca8a4973d..5fdbada93 100644
--- 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
index 4ee85c549..c9f792a63 100644
--- 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
index 9045beabf..19cd750d0 100644
--- 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 Program = @import("Program.zig");
 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;