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

---
 ui/font.h             |  2 +-
 ui/gameMainWindow.cpp |  2 +-
 ui/icon.cpp           |  2 +-
 ui/iconButton.cpp     |  2 +-
 ui/text.h             |  2 +-
 ui/window.cpp         | 10 +++++-----
 ui/window.h           |  6 +++---
 7 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'ui')

diff --git a/ui/font.h b/ui/font.h
index 52b92a7..6c86e18 100644
--- a/ui/font.h
+++ b/ui/font.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <GL/glew.h>
 #include <array>
 #include <cache.h>
 #include <cstddef>
 #include <cstdint>
 #include <filesystem>
 #include <glArrays.h>
+#include <glad/gl.h>
 #include <glm/glm.hpp>
 #include <map>
 #include <string_view>
diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp
index a7f17dc..c35c9c6 100644
--- a/ui/gameMainWindow.cpp
+++ b/ui/gameMainWindow.cpp
@@ -6,13 +6,13 @@
 #include "modeHelper.h"
 #include "toolbar.h"
 #include "window.h"
-#include <GL/glew.h>
 #include <SDL2/SDL.h>
 #include <collection.h>
 #include <game/gamestate.h>
 #include <game/network/rail.h>
 #include <game/worldobject.h> // IWYU pragma: keep
 #include <gfx/renderable.h>
+#include <glad/gl.h>
 #include <glm/glm.hpp>
 #include <memory>
 #include <utility>
diff --git a/ui/icon.cpp b/ui/icon.cpp
index be1a63c..38f4bf9 100644
--- a/ui/icon.cpp
+++ b/ui/icon.cpp
@@ -1,7 +1,7 @@
 #include "icon.h"
 #include "glArrays.h"
-#include <GL/glew.h>
 #include <gfx/image.h>
+#include <glad/gl.h>
 #include <resource.h>
 #include <stb/stb_image.h>
 
diff --git a/ui/iconButton.cpp b/ui/iconButton.cpp
index f74b3fc..fe8c817 100644
--- a/ui/iconButton.cpp
+++ b/ui/iconButton.cpp
@@ -2,11 +2,11 @@
 #include "glArrays.h"
 #include "ui/icon.h"
 #include "ui/uiComponent.h"
-#include <GL/glew.h>
 #include <SDL2/SDL.h>
 #include <array>
 #include <filesystem>
 #include <functional>
+#include <glad/gl.h>
 #include <glm/gtc/type_ptr.hpp>
 #include <utility>
 
diff --git a/ui/text.h b/ui/text.h
index cbe49de..9fe87d1 100644
--- a/ui/text.h
+++ b/ui/text.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "uiComponent.h"
-#include <GL/glew.h>
 #include <glArrays.h>
+#include <glad/gl.h>
 #include <glm/glm.hpp>
 #include <string_view>
 #include <vector>
diff --git a/ui/window.cpp b/ui/window.cpp
index 731996a..93e85bd 100644
--- a/ui/window.cpp
+++ b/ui/window.cpp
@@ -1,20 +1,20 @@
 #include "window.h"
 #include "uiComponent.h"
 #include "worldOverlay.h"
-#include <GL/glew.h>
+#include <glad/gl.h>
 #include <glm/glm.hpp>
 #include <stdexcept>
 #include <tuple>
 #include <type_traits>
 
-Window::GlewInitHelper::GlewInitHelper()
+Window::GLInitHelper::GLInitHelper()
 {
 	[[maybe_unused]] static auto init = []() {
-		if (const auto r = glewInit(); r != GLEW_OK) {
-			throw std::runtime_error {reinterpret_cast<const char *>(glewGetErrorString(r))};
+		if (const auto version = gladLoadGL(reinterpret_cast<GLADloadfunc>(SDL_GL_GetProcAddress)); version != 40006) {
+			throw std::runtime_error {std::to_string(version)};
 		}
 		else {
-			return r;
+			return version;
 		}
 	}();
 }
diff --git a/ui/window.h b/ui/window.h
index be9e114..369228a 100644
--- a/ui/window.h
+++ b/ui/window.h
@@ -31,14 +31,14 @@ public:
 
 protected:
 	virtual void render() const;
-	struct GlewInitHelper {
-		GlewInitHelper();
+	struct GLInitHelper {
+		GLInitHelper();
 	};
 
 	const glm::ivec2 size;
 	SDL_WindowPtr m_window;
 	SDL_GLContextPtr glContext;
-	GlewInitHelper glewinithelper;
+	GLInitHelper glInithelper;
 	Collection<UIComponent> uiComponents;
 	UIShader uiShader;
 };
-- 
cgit v1.2.3