From 3c1c392ab177566f09d11a380210e1937741fad2 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 28 May 2023 11:45:01 +0100
Subject: Swap GLEW for more modern glad

---
 gfx/gl/program.h           | 2 +-
 gfx/gl/shader.h            | 4 ++--
 gfx/gl/uiShader.h          | 2 +-
 gfx/gl/vertexArrayObject.h | 2 +-
 gfx/models/mesh.h          | 2 +-
 gfx/models/texture.cpp     | 2 +-
 gfx/models/vertex.h        | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'gfx')

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 {
-- 
cgit v1.2.3