gl wrapper moved to rendering

Main.cpp

@@ -1,5 +1,6 @@
 #include "math/Vector.h"
 #include "rendering/Framebuffer.h"
+#include "rendering/GL.h"
 #include "rendering/Window.h"
 #include "tests/ArrayListTests.h"
 #include "tests/ArrayTests.h"
@@ -27,7 +28,6 @@
 #include "tests/UniquePointerTests.h"
 #include "tests/VectorTests.h"
 #include "utils/Logger.h"
-#include "wrapper/GL.h"
 
 static int ticks = 40;
 

meson.build

@@ -16,13 +16,13 @@ src = [
     'rendering/Texture.cpp',
     'rendering/VertexBuffer.cpp',
     'rendering/Window.cpp',
+    'rendering/GL.cpp',
     'data/BitArray.cpp',
     'utils/Buffer.cpp',
     'utils/Clock.cpp',
     'utils/Error.cpp',
     'utils/Logger.cpp',
     'utils/Random.cpp',
-    'wrapper/GL.cpp',
     'libs/lodepng/lodepng.cpp',
 ]
 

wrapper/GL.cpp → rendering/GL.cpp

@@ -2,8 +2,8 @@
 #include <type_traits>
 
 #include "data/Array.h"
+#include "rendering/GL.h"
 #include "utils/Logger.h"
-#include "wrapper/GL.h"
 
 static_assert(std::is_same<GL::Shader, GLuint>::value,
               "shader has invalid type");

rendering/Shader.cpp

@@ -2,7 +2,6 @@
 
 #include "rendering/Shader.h"
 #include "utils/Logger.h"
-#include "wrapper/GL.h"
 
 Shader::Shader() : shaders(0), program(0) {
 }

rendering/Shader.h

@@ -4,8 +4,8 @@
 #include "data/Array.h"
 #include "data/List.h"
 #include "math/Vector.h"
+#include "rendering/GL.h"
 #include "utils/Error.h"
-#include "wrapper/GL.h"
 
 class Shader final {
     static constexpr int MAX_SHADERS = 5;

rendering/Texture.h

@@ -1,7 +1,7 @@
 #ifndef TEXTURE_H
 #define TEXTURE_H
 
-#include "wrapper/GL.h"
+#include "rendering/GL.h"
 
 struct Texture final {
     struct Format final {

rendering/VertexBuffer.h

@@ -2,7 +2,7 @@
 #define VERTEXBUFFER_H
 
 #include "data/ArrayList.h"
-#include "wrapper/GL.h"
+#include "rendering/GL.h"
 
 class VertexBuffer final {
     GL::VertexArray vertexArray;