From 3b2f18ca9340dfe1ecd52074cc03ae769fe05b0b Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 10 Dec 2023 12:06:05 +0200
Subject: [PATCH] Add missing includes and forward declarations

---
 source/backends/opengl/buffer_backend.h        | 1 +
 source/backends/opengl/module_backend.h        | 1 +
 source/backends/opengl/program_backend.h       | 3 +++
 source/backends/opengl/sampler_backend.h       | 1 +
 source/backends/opengl/texture_backend.h       | 1 +
 source/backends/opengl/vertexsetup_backend.h   | 1 +
 source/backends/vulkan/buffer_backend.h        | 1 +
 source/backends/vulkan/device_backend.h        | 2 +-
 source/backends/vulkan/module_backend.h        | 1 +
 source/backends/vulkan/pipelinestate_backend.h | 3 +++
 source/backends/vulkan/program_backend.h       | 3 +++
 source/backends/vulkan/renderpass.h            | 2 ++
 source/backends/vulkan/sampler_backend.h       | 1 +
 source/backends/vulkan/synchronizer.h          | 1 +
 source/backends/vulkan/texture_backend.h       | 2 ++
 source/backends/vulkan/transferqueue.h         | 1 +
 source/backends/vulkan/vertexsetup_backend.h   | 1 +
 source/backends/vulkan/vulkan.h                | 1 +
 source/builders/pipelinebuilder.h              | 1 +
 source/builders/vertexbuilder.h                | 2 +-
 source/effects/shadowmap.h                     | 2 ++
 source/effects/sky.h                           | 1 +
 source/materials/splatmaterial.h               | 1 +
 source/render/zsortedscene.h                   | 2 ++
 24 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/source/backends/opengl/buffer_backend.h b/source/backends/opengl/buffer_backend.h
index a419e602..5a669955 100644
--- a/source/backends/opengl/buffer_backend.h
+++ b/source/backends/opengl/buffer_backend.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_BUFFER_BACKEND_H_
 #define MSP_GL_BUFFER_BACKEND_H_
 
+#include <string>
 #include <msp/core/noncopyable.h>
 #include "mspgl_api.h"
 
diff --git a/source/backends/opengl/module_backend.h b/source/backends/opengl/module_backend.h
index d0b308ca..eddfdd35 100644
--- a/source/backends/opengl/module_backend.h
+++ b/source/backends/opengl/module_backend.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_MODULE_BACKEND_H_
 #define MSP_GL_MODULE_BACKEND_H_
 
+#include <string>
 #include <msp/core/noncopyable.h>
 #include "mspgl_api.h"
 
diff --git a/source/backends/opengl/program_backend.h b/source/backends/opengl/program_backend.h
index 3a4c3b43..1b383f82 100644
--- a/source/backends/opengl/program_backend.h
+++ b/source/backends/opengl/program_backend.h
@@ -11,6 +11,9 @@
 namespace Msp {
 namespace GL {
 
+class GlslModule;
+class SpirVModule;
+
 class MSPGL_API OpenGLProgram: public NonCopyable
 {
 	friend class OpenGLPipelineState;
diff --git a/source/backends/opengl/sampler_backend.h b/source/backends/opengl/sampler_backend.h
index 7b1bd35a..d23ee0f9 100644
--- a/source/backends/opengl/sampler_backend.h
+++ b/source/backends/opengl/sampler_backend.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_SAMPLER_BACKEND_H_
 #define MSP_GL_SAMPLER_BACKEND_H_
 
+#include <string>
 #include <msp/core/noncopyable.h>
 #include "mspgl_api.h"
 
diff --git a/source/backends/opengl/texture_backend.h b/source/backends/opengl/texture_backend.h
index 2c300bc7..ed9000b2 100644
--- a/source/backends/opengl/texture_backend.h
+++ b/source/backends/opengl/texture_backend.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_TEXTURE_BACKEND_H_
 #define MSP_GL_TEXTURE_BACKEND_H_
 
+#include <string>
 #include <msp/core/noncopyable.h>
 #include "mspgl_api.h"
 
diff --git a/source/backends/opengl/vertexsetup_backend.h b/source/backends/opengl/vertexsetup_backend.h
index e074d566..aa368b4c 100644
--- a/source/backends/opengl/vertexsetup_backend.h
+++ b/source/backends/opengl/vertexsetup_backend.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_VERTEXSETUP_BACKEND_H_
 #define MSP_GL_VERTEXSETUP_BACKEND_H_
 
+#include <string>
 #include <msp/core/noncopyable.h>
 #include "mspgl_api.h"
 
diff --git a/source/backends/vulkan/buffer_backend.h b/source/backends/vulkan/buffer_backend.h
index a265560a..06665113 100644
--- a/source/backends/vulkan/buffer_backend.h
+++ b/source/backends/vulkan/buffer_backend.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_BUFFER_BACKEND_H_
 #define MSP_GL_BUFFER_BACKEND_H_
 
+#include <string>
 #include <msp/core/noncopyable.h>
 #include "handles.h"
 #include "mspgl_api.h"
diff --git a/source/backends/vulkan/device_backend.h b/source/backends/vulkan/device_backend.h
index e5881b2d..8066df64 100644
--- a/source/backends/vulkan/device_backend.h
+++ b/source/backends/vulkan/device_backend.h
@@ -16,7 +16,7 @@
 namespace Msp {
 namespace GL {
 
-struct VulkanFunctions;
+class VulkanFunctions;
 
 constexpr unsigned MAX_FRAMES_IN_FLIGHT = 3;
 
diff --git a/source/backends/vulkan/module_backend.h b/source/backends/vulkan/module_backend.h
index f6be266a..ddaf617d 100644
--- a/source/backends/vulkan/module_backend.h
+++ b/source/backends/vulkan/module_backend.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_MODULE_BACKEND_H_
 #define MSP_GL_MODULE_BACKEND_H_
 
+#include <string>
 #include "handles.h"
 #include "mspgl_api.h"
 
diff --git a/source/backends/vulkan/pipelinestate_backend.h b/source/backends/vulkan/pipelinestate_backend.h
index a8624f42..0a702faa 100644
--- a/source/backends/vulkan/pipelinestate_backend.h
+++ b/source/backends/vulkan/pipelinestate_backend.h
@@ -1,6 +1,9 @@
 #ifndef MSP_GL_PIPELINESTATE_BACKEND_H_
 #define MSP_GL_PIPELINESTATE_BACKEND_H_
 
+#include <cstdint>
+#include <string>
+#include <vector>
 #include <msp/core/noncopyable.h>
 #include "handles.h"
 #include "mspgl_api.h"
diff --git a/source/backends/vulkan/program_backend.h b/source/backends/vulkan/program_backend.h
index 4d424587..bfdf1bd5 100644
--- a/source/backends/vulkan/program_backend.h
+++ b/source/backends/vulkan/program_backend.h
@@ -7,11 +7,14 @@
 #include <msp/core/noncopyable.h>
 #include "mspgl_api.h"
 #include "reflectdata.h"
+#include "handles.h"
 
 namespace Msp {
 namespace GL {
 
 class Device;
+class GlslModule;
+class SpirVModule;
 
 class MSPGL_API VulkanProgram: public NonCopyable
 {
diff --git a/source/backends/vulkan/renderpass.h b/source/backends/vulkan/renderpass.h
index 97299e8c..67e916c3 100644
--- a/source/backends/vulkan/renderpass.h
+++ b/source/backends/vulkan/renderpass.h
@@ -1,8 +1,10 @@
 #ifndef MSP_GL_RENDERPASS_H_
 #define MSP_GL_RENDERPASS_H_
 
+#include <cstdint>
 #include <vector>
 #include "handles.h"
+#include "rect.h"
 
 namespace Msp {
 namespace GL {
diff --git a/source/backends/vulkan/sampler_backend.h b/source/backends/vulkan/sampler_backend.h
index 5e2204d5..493e9ec7 100644
--- a/source/backends/vulkan/sampler_backend.h
+++ b/source/backends/vulkan/sampler_backend.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_SAMPLER_BACKEND_H_
 #define MSP_GL_SAMPLER_BACKEND_H_
 
+#include <string>
 #include "handles.h"
 #include "mspgl_api.h"
 
diff --git a/source/backends/vulkan/synchronizer.h b/source/backends/vulkan/synchronizer.h
index 30dea564..8fbcaac8 100644
--- a/source/backends/vulkan/synchronizer.h
+++ b/source/backends/vulkan/synchronizer.h
@@ -8,6 +8,7 @@
 namespace Msp {
 namespace GL {
 
+class Device;
 class VulkanCommandRecorder;
 
 class Synchronizer
diff --git a/source/backends/vulkan/texture_backend.h b/source/backends/vulkan/texture_backend.h
index 69c456dd..2152331c 100644
--- a/source/backends/vulkan/texture_backend.h
+++ b/source/backends/vulkan/texture_backend.h
@@ -1,6 +1,8 @@
 #ifndef MSP_GL_TEXTURE_BACKEND_H_
 #define MSP_GL_TEXTURE_BACKEND_H_
 
+#include <string>
+#include <vector>
 #include <msp/core/noncopyable.h>
 #include "handles.h"
 #include "mspgl_api.h"
diff --git a/source/backends/vulkan/transferqueue.h b/source/backends/vulkan/transferqueue.h
index 5d6c926c..e1d9c784 100644
--- a/source/backends/vulkan/transferqueue.h
+++ b/source/backends/vulkan/transferqueue.h
@@ -2,6 +2,7 @@
 #define MSP_GL_VULKAN_TRANSFERQUEUE_H_
 
 #include <functional>
+#include <map>
 #include <vector>
 #include "handles.h"
 
diff --git a/source/backends/vulkan/vertexsetup_backend.h b/source/backends/vulkan/vertexsetup_backend.h
index d6809fba..91acf50a 100644
--- a/source/backends/vulkan/vertexsetup_backend.h
+++ b/source/backends/vulkan/vertexsetup_backend.h
@@ -2,6 +2,7 @@
 #define MSP_GL_VERTEXSETUP_BACKEND_H_
 
 #include <cstdint>
+#include <string>
 #include <vector>
 #include <msp/core/noncopyable.h>
 #include "handles.h"
diff --git a/source/backends/vulkan/vulkan.h b/source/backends/vulkan/vulkan.h
index b287b4dd..2c3f5573 100644
--- a/source/backends/vulkan/vulkan.h
+++ b/source/backends/vulkan/vulkan.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_VULKAN_H_
 #define MSP_GL_VULKAN_H_
 
+#include <cstdint>
 #include <vulkan/vulkan.h>
 #include <msp/graphics/vulkancontext.h>
 #include "handles.h"
diff --git a/source/builders/pipelinebuilder.h b/source/builders/pipelinebuilder.h
index 4a576c73..aa3757ee 100644
--- a/source/builders/pipelinebuilder.h
+++ b/source/builders/pipelinebuilder.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_PIPELINEBUILDER_H_
 #define MSP_GL_PIPELINEBUILDER_H_
 
+#include <msp/core/attributes.h>
 #include "sequencebuilder.h"
 
 namespace Msp {
diff --git a/source/builders/vertexbuilder.h b/source/builders/vertexbuilder.h
index 7fdc15bc..026563b6 100644
--- a/source/builders/vertexbuilder.h
+++ b/source/builders/vertexbuilder.h
@@ -1,7 +1,7 @@
 #ifndef MSP_GL_VERTEXBUILDER_H_
 #define MSP_GL_VERTEXBUILDER_H_
 
-#include <map>
+#include <vector>
 #include "color.h"
 #include "matrix.h"
 #include "vector.h"
diff --git a/source/effects/shadowmap.h b/source/effects/shadowmap.h
index 2d2d04db..a4767b82 100644
--- a/source/effects/shadowmap.h
+++ b/source/effects/shadowmap.h
@@ -15,7 +15,9 @@ namespace GL {
 
 class DirectionalLight;
 class Light;
+class Lighting;
 class PointLight;
+class Sampler;
 
 /**
 Creates a depth texture which can be used to add shadows to a renderable.
diff --git a/source/effects/sky.h b/source/effects/sky.h
index 8785f9f7..2b886d1c 100644
--- a/source/effects/sky.h
+++ b/source/effects/sky.h
@@ -12,6 +12,7 @@ namespace GL {
 class DirectionalLight;
 class Mesh;
 class Program;
+class Sampler;
 
 /**
 Renders a procedurally generated sky at the background.
diff --git a/source/materials/splatmaterial.h b/source/materials/splatmaterial.h
index 9fc7de4e..040ccf52 100644
--- a/source/materials/splatmaterial.h
+++ b/source/materials/splatmaterial.h
@@ -7,6 +7,7 @@ namespace Msp {
 namespace GL {
 
 class Texture;
+class Texture2D;
 class Texture2DArray;
 
 class MSPGL_API SplatMaterial: public Material, public NonCopyable
diff --git a/source/render/zsortedscene.h b/source/render/zsortedscene.h
index 4e704a71..24267510 100644
--- a/source/render/zsortedscene.h
+++ b/source/render/zsortedscene.h
@@ -9,6 +9,8 @@
 namespace Msp {
 namespace GL {
 
+class Camera;
+
 enum SortOrder
 {
 	FRONT_TO_BACK = 0,
-- 
2.45.2