summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2023-05-28 11:45:22 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2023-05-28 11:45:22 +0100
commitfdea7529ba09a615d92da5823429b49c7e565c9d (patch)
tree67b12689c60dc2e75a5587988dd11bf36c12da9a /gfx
parentMark main rule as always, so we can always launch it (diff)
parentSwap GLEW for more modern glad (diff)
downloadilt-fdea7529ba09a615d92da5823429b49c7e565c9d.tar.bz2
ilt-fdea7529ba09a615d92da5823429b49c7e565c9d.tar.xz
ilt-fdea7529ba09a615d92da5823429b49c7e565c9d.zip
Merge branch 'glad'
Diffstat (limited to 'gfx')
-rw-r--r--gfx/gl/program.h2
-rw-r--r--gfx/gl/shader.h4
-rw-r--r--gfx/gl/uiShader.h2
-rw-r--r--gfx/gl/vertexArrayObject.h2
-rw-r--r--gfx/models/mesh.h2
-rw-r--r--gfx/models/texture.cpp2
-rw-r--r--gfx/models/vertex.h2
7 files changed, 8 insertions, 8 deletions
diff --git a/gfx/gl/program.h b/gfx/gl/program.h
index 2708ff0..76b6742 100644
--- a/gfx/gl/program.h
+++ b/gfx/gl/program.h
@@ -1,8 +1,8 @@
#pragma once
#include "shader.h"
-#include <GL/glew.h>
#include <glRef.h>
+#include <glad/gl.h>
#include <glm/mat4x4.hpp>
#include <special_members.h>
diff --git a/gfx/gl/shader.h b/gfx/gl/shader.h
index cb8065b..0810e6b 100644
--- a/gfx/gl/shader.h
+++ b/gfx/gl/shader.h
@@ -1,13 +1,13 @@
#pragma once
-#include <GL/glew.h>
#include <glRef.h>
+#include <glad/gl.h>
#include <optional>
#include <string_view>
class Shader {
public:
- using ShaderRef = glRef<GLuint, &__glewCreateShader, &__glewDeleteShader>;
+ using ShaderRef = glRef<GLuint, &glCreateShader, &glDeleteShader>;
constexpr Shader(const GLchar * text, GLint len, GLuint type) : text {text}, len {len}, type {type} { }
[[nodiscard]] ShaderRef compile() const;
diff --git a/gfx/gl/uiShader.h b/gfx/gl/uiShader.h
index 054c944..2766af8 100644
--- a/gfx/gl/uiShader.h
+++ b/gfx/gl/uiShader.h
@@ -1,8 +1,8 @@
#pragma once
#include "program.h"
-#include <GL/glew.h>
#include <cstddef>
+#include <glad/gl.h>
#include <glm/glm.hpp>
#include <glm/gtc/type_ptr.hpp>
diff --git a/gfx/gl/vertexArrayObject.h b/gfx/gl/vertexArrayObject.h
index 1d27588..fa6baa3 100644
--- a/gfx/gl/vertexArrayObject.h
+++ b/gfx/gl/vertexArrayObject.h
@@ -3,7 +3,7 @@
#include "collections.h"
#include "gl_traits.h"
#include "special_members.h"
-#include <GL/glew.h>
+#include <glad/gl.h>
class VertexArrayObject {
public:
diff --git a/gfx/models/mesh.h b/gfx/models/mesh.h
index 972fe30..71f6dce 100644
--- a/gfx/models/mesh.h
+++ b/gfx/models/mesh.h
@@ -1,8 +1,8 @@
#pragma once
#include "gfx/gl/vertexArrayObject.h"
-#include <GL/glew.h>
#include <glArrays.h>
+#include <glad/gl.h>
#include <memory>
#include <span>
#include <stdTypeDefs.h>
diff --git a/gfx/models/texture.cpp b/gfx/models/texture.cpp
index 3003319..380f2e0 100644
--- a/gfx/models/texture.cpp
+++ b/gfx/models/texture.cpp
@@ -1,11 +1,11 @@
#include "texture.h"
#include "glArrays.h"
#include "tga.h"
-#include <GL/glew.h>
#include <cache.h>
#include <fcntl.h>
#include <filesystem.h>
#include <gfx/image.h>
+#include <glad/gl.h>
#include <glm/geometric.hpp>
#include <resource.h>
#include <stb/stb_image.h>
diff --git a/gfx/models/vertex.h b/gfx/models/vertex.h
index 181e7e7..0464ea7 100644
--- a/gfx/models/vertex.h
+++ b/gfx/models/vertex.h
@@ -1,6 +1,6 @@
#pragma once
-#include <GL/glew.h>
+#include <glad/gl.h>
#include <glm/glm.hpp>
class Vertex {