From 1686a01b6ae7467e71eac247078248de4a3b3423 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 13 Dec 2021 23:47:30 +0000
Subject: Refactor to start splitting out UI components

---
 gfx/gl/glSource.cpp | 2 ++
 gfx/gl/glSource.h   | 1 +
 gfx/gl/shader.cpp   | 3 +--
 gfx/gl/shader.h     | 2 --
 gfx/gl/uiShader.cpp | 4 +++-
 gfx/gl/uiShader.h   | 3 ++-
 6 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'gfx/gl')

diff --git a/gfx/gl/glSource.cpp b/gfx/gl/glSource.cpp
index 13686ae..49773d0 100644
--- a/gfx/gl/glSource.cpp
+++ b/gfx/gl/glSource.cpp
@@ -1,5 +1,7 @@
 #include "glSource.h"
 #include <array>
+#include <stdexcept>
+#include <string>
 
 GLsource::ShaderRef
 GLsource::compile() const
diff --git a/gfx/gl/glSource.h b/gfx/gl/glSource.h
index 53c221b..e44c5a2 100644
--- a/gfx/gl/glSource.h
+++ b/gfx/gl/glSource.h
@@ -3,6 +3,7 @@
 
 #include <GL/glew.h>
 #include <glRef.hpp>
+#include <string_view>
 
 struct GLsource {
 	using ShaderRef = glRef<GLuint, __glewCreateShader, __glewDeleteShader>;
diff --git a/gfx/gl/shader.cpp b/gfx/gl/shader.cpp
index 03e7899..a196e07 100644
--- a/gfx/gl/shader.cpp
+++ b/gfx/gl/shader.cpp
@@ -2,6 +2,7 @@
 #include "gfx/gl/glSource.h"
 #include <array>
 #include <cstddef>
+#include <gfx/gl/programHandle.h>
 #include <gfx/gl/shaders/fs-basicShader.h>
 #include <gfx/gl/shaders/fs-landmassShader.h>
 #include <gfx/gl/shaders/fs-waterShader.h>
@@ -13,8 +14,6 @@
 #include <glm/gtx/transform.hpp>
 #include <location.hpp>
 #include <maths.h>
-#include <stdexcept>
-#include <string>
 
 Shader::ProgramHandle::ProgramHandle(GLuint vs, GLuint fs) : ProgramHandleBase {vs, fs}
 {
diff --git a/gfx/gl/shader.h b/gfx/gl/shader.h
index 249b2f4..7df7a07 100644
--- a/gfx/gl/shader.h
+++ b/gfx/gl/shader.h
@@ -4,9 +4,7 @@
 #include "programHandle.h"
 #include <GL/glew.h>
 #include <array>
-#include <glRef.hpp>
 #include <glm/glm.hpp>
-#include <string_view>
 
 class Location;
 
diff --git a/gfx/gl/uiShader.cpp b/gfx/gl/uiShader.cpp
index 2fbb0d4..b3fee14 100644
--- a/gfx/gl/uiShader.cpp
+++ b/gfx/gl/uiShader.cpp
@@ -1,8 +1,10 @@
 #include "uiShader.h"
+#include <gfx/gl/glSource.h>
+#include <gfx/gl/programHandle.h>
 #include <gfx/gl/shaders/fs-uiShader.h>
 #include <gfx/gl/shaders/vs-uiShader.h>
+#include <glm/glm.hpp>
 #include <glm/gtc/type_ptr.hpp>
-#include <glm/gtx/transform.hpp>
 
 UIShader::UIShader(size_t width, size_t height) : program {uiShader_vs.compile(), uiShader_fs.compile()}
 {
diff --git a/gfx/gl/uiShader.h b/gfx/gl/uiShader.h
index ff0e96d..b251136 100644
--- a/gfx/gl/uiShader.h
+++ b/gfx/gl/uiShader.h
@@ -2,7 +2,8 @@
 #define UISHADER_H
 
 #include "programHandle.h"
-#include <cstdint>
+#include <GL/glew.h>
+#include <cstddef>
 
 class UIShader {
 public:
-- 
cgit v1.2.3