From 4727fa9b7b7298e5847c015f5b7ad6db230e6a28 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 15 Nov 2022 13:12:30 -0800 Subject: [PATCH] move opengl to renderer dir --- src/renderer/OpenGL.zig | 2 +- src/{ => renderer}/opengl/Buffer.zig | 0 src/{ => renderer}/opengl/Program.zig | 0 src/{ => renderer}/opengl/Shader.zig | 0 src/{ => renderer}/opengl/Texture.zig | 0 src/{ => renderer}/opengl/VertexArray.zig | 0 src/{ => renderer}/opengl/c.zig | 0 src/{ => renderer}/opengl/draw.zig | 0 src/{ => renderer}/opengl/errors.zig | 0 src/{ => renderer}/opengl/extensions.zig | 0 src/{ => renderer}/opengl/glad.zig | 0 src/{opengl.zig => renderer/opengl/main.zig} | 18 +++++++++--------- 12 files changed, 10 insertions(+), 10 deletions(-) rename src/{ => renderer}/opengl/Buffer.zig (100%) rename src/{ => renderer}/opengl/Program.zig (100%) rename src/{ => renderer}/opengl/Shader.zig (100%) rename src/{ => renderer}/opengl/Texture.zig (100%) rename src/{ => renderer}/opengl/VertexArray.zig (100%) rename src/{ => renderer}/opengl/c.zig (100%) rename src/{ => renderer}/opengl/draw.zig (100%) rename src/{ => renderer}/opengl/errors.zig (100%) rename src/{ => renderer}/opengl/extensions.zig (100%) rename src/{ => renderer}/opengl/glad.zig (100%) rename src/{opengl.zig => renderer/opengl/main.zig} (55%) diff --git a/src/renderer/OpenGL.zig b/src/renderer/OpenGL.zig index ef5be897c..eb114ea33 100644 --- a/src/renderer/OpenGL.zig +++ b/src/renderer/OpenGL.zig @@ -13,7 +13,7 @@ const imgui = @import("imgui"); const renderer = @import("../renderer.zig"); const terminal = @import("../terminal/main.zig"); const Terminal = terminal.Terminal; -const gl = @import("../opengl.zig"); +const gl = @import("opengl/main.zig"); const trace = @import("tracy").trace; const math = @import("../math.zig"); const lru = @import("../lru.zig"); diff --git a/src/opengl/Buffer.zig b/src/renderer/opengl/Buffer.zig similarity index 100% rename from src/opengl/Buffer.zig rename to src/renderer/opengl/Buffer.zig diff --git a/src/opengl/Program.zig b/src/renderer/opengl/Program.zig similarity index 100% rename from src/opengl/Program.zig rename to src/renderer/opengl/Program.zig diff --git a/src/opengl/Shader.zig b/src/renderer/opengl/Shader.zig similarity index 100% rename from src/opengl/Shader.zig rename to src/renderer/opengl/Shader.zig diff --git a/src/opengl/Texture.zig b/src/renderer/opengl/Texture.zig similarity index 100% rename from src/opengl/Texture.zig rename to src/renderer/opengl/Texture.zig diff --git a/src/opengl/VertexArray.zig b/src/renderer/opengl/VertexArray.zig similarity index 100% rename from src/opengl/VertexArray.zig rename to src/renderer/opengl/VertexArray.zig diff --git a/src/opengl/c.zig b/src/renderer/opengl/c.zig similarity index 100% rename from src/opengl/c.zig rename to src/renderer/opengl/c.zig diff --git a/src/opengl/draw.zig b/src/renderer/opengl/draw.zig similarity index 100% rename from src/opengl/draw.zig rename to src/renderer/opengl/draw.zig diff --git a/src/opengl/errors.zig b/src/renderer/opengl/errors.zig similarity index 100% rename from src/opengl/errors.zig rename to src/renderer/opengl/errors.zig diff --git a/src/opengl/extensions.zig b/src/renderer/opengl/extensions.zig similarity index 100% rename from src/opengl/extensions.zig rename to src/renderer/opengl/extensions.zig diff --git a/src/opengl/glad.zig b/src/renderer/opengl/glad.zig similarity index 100% rename from src/opengl/glad.zig rename to src/renderer/opengl/glad.zig diff --git a/src/opengl.zig b/src/renderer/opengl/main.zig similarity index 55% rename from src/opengl.zig rename to src/renderer/opengl/main.zig index 79882b012..402222c53 100644 --- a/src/opengl.zig +++ b/src/renderer/opengl/main.zig @@ -11,13 +11,13 @@ //! 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("opengl/c.zig"); -pub const glad = @import("opengl/glad.zig"); -pub usingnamespace @import("opengl/draw.zig"); +pub const c = @import("c.zig"); +pub const glad = @import("glad.zig"); +pub usingnamespace @import("draw.zig"); -pub const ext = @import("opengl/extensions.zig"); -pub const Buffer = @import("opengl/Buffer.zig"); -pub const Program = @import("opengl/Program.zig"); -pub const Shader = @import("opengl/Shader.zig"); -pub const Texture = @import("opengl/Texture.zig"); -pub const VertexArray = @import("opengl/VertexArray.zig"); +pub const ext = @import("extensions.zig"); +pub const Buffer = @import("Buffer.zig"); +pub const Program = @import("Program.zig"); +pub const Shader = @import("Shader.zig"); +pub const Texture = @import("Texture.zig"); +pub const VertexArray = @import("VertexArray.zig");