Clean up includes and forward declarations for the core classes

diff --git a/source/core/batch.cpp b/source/core/batch.cpp
index b882cf1be18f6f5e0b2ede67e831a8eed0ae1cee..48a49791370dab47de0e0490336aee24766843a7 100644 (file)
--- a/source/core/batch.cpp
+++ b/source/core/batch.cpp
@@ -1,9 +1,6 @@
 #include <msp/gl/extensions/msp_primitive_restart.h>
 #include "batch.h"
-#include "buffer.h"
 #include "error.h"
-#include "mesh.h"
-#include "vertexarray.h"
 
 using namespace std;
 

diff --git a/source/core/buffer.h b/source/core/buffer.h
index 0e1836888dfbdd083ce47fe4c9af5dbfe6bfa3a5..df570d7eb01d2b8bae9f6115adfb2345435c4c53 100644 (file)
--- a/source/core/buffer.h
+++ b/source/core/buffer.h
@@ -3,7 +3,6 @@
 
 #include <stdexcept>
 #include <string>
-#include <vector>
 
 namespace Msp {
 namespace GL {

diff --git a/source/core/bufferable.cpp b/source/core/bufferable.cpp
index 9c5120a4af6cd9d38b74c3b291b19e4488fb4b61..abbde26381019db839d0064bfdee1de83f889fbc 100644 (file)
--- a/source/core/bufferable.cpp
+++ b/source/core/bufferable.cpp
@@ -1,6 +1,4 @@
 #include <stdexcept>
-#include <msp/core/raii.h>
-#include <msp/gl/extensions/arb_direct_state_access.h>
 #include "buffer.h"
 #include "bufferable.h"
 

diff --git a/source/core/clipplane.cpp b/source/core/clipplane.cpp
index 3e0d5f6602beef43d414f68d97076f09f7c5f4c7..fe784d256dbe5dfdf3c754fc3add92c458f96fd1 100644 (file)
--- a/source/core/clipplane.cpp
+++ b/source/core/clipplane.cpp
@@ -1,7 +1,5 @@
 #include <msp/strings/format.h>
 #include "clipplane.h"
-#include "gl.h"
-#include "matrix.h"
 #include "programdata.h"
 
 namespace Msp {

diff --git a/source/core/clipplane.h b/source/core/clipplane.h
index 9160e526cbb2e2d0bccdb25ac7fcb126d1c42c63..2cf9b18bcde6b14d8975fa252222fe91ca4b8c39 100644 (file)
--- a/source/core/clipplane.h
+++ b/source/core/clipplane.h
@@ -6,7 +6,6 @@
 namespace Msp {
 namespace GL {
 
-class Matrix;
 class ProgramData;
 
 class ClipPlane

diff --git a/source/core/commands.h b/source/core/commands.h
index 6969b820306d88506424655dc3ef0516a8ac0511..ca10f7845b78a54dd588f60c37c0fc3d7c958f55 100644 (file)
--- a/source/core/commands.h
+++ b/source/core/commands.h
@@ -1,5 +1,5 @@
-#ifndef COMMANDS_H_
-#define COMMANDS_H_
+#ifndef MSP_GL_COMMANDS_H_
+#define MSP_GL_COMMANDS_H_
 
 #include "framebuffer.h"
 

diff --git a/source/core/deviceinfo.cpp b/source/core/deviceinfo.cpp
index 93297a790974b23479c165b9b576d6fdf6220576..acbd0a73e7eeb1e44831860729af262fca065987 100644 (file)
--- a/source/core/deviceinfo.cpp
+++ b/source/core/deviceinfo.cpp
@@ -1,3 +1,8 @@
+#include <msp/gl/extensions/arb_uniform_buffer_object.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
+#include <msp/gl/extensions/ext_framebuffer_multisample.h>
+#include <msp/gl/extensions/msp_clipping.h>
+#include <msp/gl/extensions/nv_fbo_color_attachments.h>
 #include "deviceinfo.h"
 #include "gl.h"
 

diff --git a/source/core/framebuffer.h b/source/core/framebuffer.h
index 89407e8ba69b270bcc4f707eed89dc81a6b52028..da828bf531f7c70eafc74d297712266fed97fa37 100644 (file)
--- a/source/core/framebuffer.h
+++ b/source/core/framebuffer.h
@@ -9,7 +9,6 @@
 namespace Msp {
 namespace GL {
 
-class Texture;
 class Texture2D;
 class Texture2DMultisample;
 class Texture3D;

diff --git a/source/core/matrix.cpp b/source/core/matrix.cpp
index 311958ab99542574edfe3cda35059d0eade1b24b..0eb9e916aac6a56cffcc4de00ec08d35edc77812 100644 (file)
--- a/source/core/matrix.cpp
+++ b/source/core/matrix.cpp
@@ -1,7 +1,6 @@
-#include <algorithm>
 #include <cmath>
+#include <stdexcept>
 #include <msp/geometry/affinetransformation.h>
-#include "error.h"
 #include "matrix.h"
 
 using namespace std;

diff --git a/source/core/matrix.h b/source/core/matrix.h
index e2f1ada0cc527cf30210874b1a4cfc4a69f98f4d..71531ef68b2e4d17abd27fa7bed70be7154edcbd 100644 (file)
--- a/source/core/matrix.h
+++ b/source/core/matrix.h
@@ -1,7 +1,6 @@
 #ifndef MSP_GL_MATRIX_H_
 #define MSP_GL_MATRIX_H_
 
-#include <vector>
 #include <msp/geometry/angle.h>
 #include <msp/linal/squarematrix.h>
 #include "vector.h"

diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp
index 371b38b4894a96935cbd2c75326e790e38e45ce6..029c16e0fac6b04d35f1847faf2590fafd320c1f 100644 (file)
--- a/source/core/mesh.cpp
+++ b/source/core/mesh.cpp
@@ -1,13 +1,8 @@
-#include <msp/gl/extensions/arb_vertex_array_object.h>
-#include <msp/gl/extensions/arb_vertex_buffer_object.h>
-#include <msp/gl/extensions/arb_vertex_shader.h>
-#include <msp/gl/extensions/khr_debug.h>
 #include "buffer.h"
 #include "error.h"
 #include "mesh.h"
 #include "renderer.h"
 #include "resourcemanager.h"
-#include "vertexsetup.h"
 
 using namespace std;
 

diff --git a/source/core/mesh.h b/source/core/mesh.h
index 0cebaa69c28ce92917d796afe4e034e5434c4611..010289b04aa667eeea23b652a2088d26f81a8636 100644 (file)
--- a/source/core/mesh.h
+++ b/source/core/mesh.h
@@ -1,6 +1,8 @@
 #ifndef MSP_GL_MESH_H_
 #define MSP_GL_MESH_H_
 
+#include <string>
+#include <vector>
 #include <msp/datafile/objectloader.h>
 #include "batch.h"
 #include "cullface.h"

diff --git a/source/core/module.h b/source/core/module.h
index 14a57fe84436e5d93e707e6f635a608a222f47f1..34553b44c0e239bfeccac39b873a61b4ea26333d 100644 (file)
--- a/source/core/module.h
+++ b/source/core/module.h
@@ -1,7 +1,9 @@
 #ifndef MSP_GL_MODULE_H_
 #define MSP_GL_MODULE_H_
 
+#include <map>
 #include <string>
+#include <vector>
 #include <msp/io/base.h>
 #include "datatype.h"
 #include "glsl/compiler.h"

diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h
index 9573f9fede7eecc28a61bd7651728bb828c740cf..68983d11c1d7f3d00ef3d3656bf487c396c6f6ce 100644 (file)
--- a/source/core/pipelinestate.h
+++ b/source/core/pipelinestate.h
@@ -9,8 +9,6 @@ namespace Msp {
 namespace GL {
 
 class Blend;
-class BufferBackedUniformBlock;
-class DefaultUniformBlock;
 class DepthTest;
 class Framebuffer;
 class Program;

diff --git a/source/core/pixelformat.cpp b/source/core/pixelformat.cpp
index 6be6d7c97b36e00882022eae4b28ad314e3fc593..11eb40812ea631ff2421b88d55e39812d9ea09d5 100644 (file)
--- a/source/core/pixelformat.cpp
+++ b/source/core/pixelformat.cpp
@@ -5,7 +5,6 @@
 #include <msp/gl/extensions/ext_texture_srgb.h>
 #include <msp/gl/extensions/oes_required_internalformat.h>
 #include <msp/gl/extensions/oes_texture_stencil8.h>
-#include <msp/io/print.h>
 #include <msp/strings/format.h>
 #include "pixelformat.h"
 

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 35304554ea33b9d0911d299522ae847755223534..b1516e2dc329c95d6d26f7cc1ce6d575f990ef45 100644 (file)
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -1,8 +1,5 @@
 #include <cstring>
-#include <set>
 #include <msp/core/algorithm.h>
-#include <msp/core/maputils.h>
-#include <msp/core/raii.h>
 #include <msp/gl/extensions/arb_es2_compatibility.h>
 #include <msp/gl/extensions/arb_fragment_shader.h>
 #include <msp/gl/extensions/arb_gl_spirv.h>
@@ -15,10 +12,8 @@
 #include <msp/gl/extensions/khr_debug.h>
 #include <msp/gl/extensions/nv_non_square_matrices.h>
 #include <msp/io/print.h>
-#include "buffer.h"
 #include "error.h"
 #include "program.h"
-#include "resources.h"
 #include "glsl/compiler.h"
 
 using namespace std;

diff --git a/source/core/program.h b/source/core/program.h
index fb7fdddef91c735cd50cf3375923b8613d417635..41c5897dc08ccb54a5461a798c78b425b5315bf9 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -1,12 +1,12 @@
 #ifndef MSP_GL_PROGRAM_H_
 #define MSP_GL_PROGRAM_H_
 
+#include <map>
 #include <string>
 #include <vector>
 #include <msp/datafile/objectloader.h>
 #include "module.h"
 #include "reflectdata.h"
-#include "vertexformat.h"
 
 namespace Msp {
 namespace GL {

diff --git a/source/core/sampler.cpp b/source/core/sampler.cpp
index c36e9852c264418a50ac618a4c84cb4fd184043a..5d0121254196dd3e1b8cfae52768a6d07855caec 100644 (file)
--- a/source/core/sampler.cpp
+++ b/source/core/sampler.cpp
@@ -7,7 +7,6 @@
 #include <msp/strings/format.h>
 #include "error.h"
 #include "sampler.h"
-#include "texture.h"
 
 using namespace std;
 

diff --git a/source/core/texture.cpp b/source/core/texture.cpp
index ef8b7eef48584db1b9680338cf67b9df1d31f452..33a7b21ba8b429c63311cffdb4635f947e0f3201 100644 (file)
--- a/source/core/texture.cpp
+++ b/source/core/texture.cpp
@@ -5,7 +5,6 @@
 #include <msp/io/memory.h>
 #include "error.h"
 #include "resourcemanager.h"
-#include "resources.h"
 #include "texture.h"
 
 using namespace std;

diff --git a/source/core/texture1d.h b/source/core/texture1d.h
index 241808c1656aa034a4383a61e07897a658453728..e77f6484242d1b177a5acff236245fd7ad6988bf 100644 (file)
--- a/source/core/texture1d.h
+++ b/source/core/texture1d.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_TEXTURE1D_H_
 #define MSP_GL_TEXTURE1D_H_
 
+#include <string>
 #include "texture.h"
 
 namespace Msp {

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index 6edbba0d993a0f3795d264834c43054d5acd23b2..70a9528d9af9b030dec83c6c88f18dfedce47bd4 100644 (file)
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -4,7 +4,6 @@
 #include <msp/graphics/imageloader.h>
 #include "buffer.h"
 #include "error.h"
-#include "resources.h"
 #include "texture2d.h"
 
 using namespace std;

diff --git a/source/core/texture2d.h b/source/core/texture2d.h
index 58552f1165ea318fe664cdaea7e88bc14289ca4e..0ef4fc1fbefde4ed730cb41e2e1cd631bf4b8d24 100644 (file)
--- a/source/core/texture2d.h
+++ b/source/core/texture2d.h
@@ -2,7 +2,6 @@
 #define MSP_GL_TEXTURE2D_H_
 
 #include <string>
-#include <msp/graphics/image.h>
 #include <msp/linal/vector.h>
 #include "texture.h"
 

diff --git a/source/core/texture2darray.cpp b/source/core/texture2darray.cpp
index 3c54f7c0937bc580dd964846b8aab2cdad05b8df..1c7d363e4dcd5b3cdbfd8ab6e4c0b42ca1df7f41 100644 (file)
--- a/source/core/texture2darray.cpp
+++ b/source/core/texture2darray.cpp
@@ -1,4 +1,3 @@
-#include <msp/datafile/collection.h>
 #include <msp/gl/extensions/ext_texture_array.h>
 #include "error.h"
 #include "texture2darray.h"

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index b8e728cfa7ad3a9c64e13ee972996140c5eb864e..c35d45741ed14aa71bca1c1b2420ab785476dc5d 100644 (file)
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -3,7 +3,6 @@
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/gl/extensions/ext_texture_array.h>
-#include <msp/graphics/image.h>
 #include "error.h"
 #include "texture3d.h"
 

diff --git a/source/core/uniformblock.cpp b/source/core/uniformblock.cpp
index 8f85b87f0ba1573e8749b7f8c405382da8201360..76d657a10456a895539ddeef2246aa09a91d702a 100644 (file)
--- a/source/core/uniformblock.cpp
+++ b/source/core/uniformblock.cpp
@@ -1,13 +1,8 @@
 #include <algorithm>
 #include <msp/gl/extensions/arb_shader_objects.h>
 #include <msp/gl/extensions/arb_uniform_buffer_object.h>
-#include "buffer.h"
-#include "color.h"
 #include "deviceinfo.h"
-#include "error.h"
-#include "matrix.h"
 #include "uniformblock.h"
-#include "vector.h"
 
 using namespace std;
 

diff --git a/source/core/uniformblock.h b/source/core/uniformblock.h
index 79e699fd5bbf37c36298596deefccebe3b931ecb..ec42089a8823bb46ea75f8e94467b766f2d40459 100644 (file)
--- a/source/core/uniformblock.h
+++ b/source/core/uniformblock.h
@@ -1,21 +1,14 @@
 #ifndef MSP_GL_UNIFORMBLOCK_H_
 #define MSP_GL_UNIFORMBLOCK_H_
 
-#include <map>
 #include <vector>
 #include <msp/core/noncopyable.h>
 #include "bufferable.h"
 #include "reflectdata.h"
-#include "vector.h"
 
 namespace Msp {
 namespace GL {
 
-class BufferRange;
-class Matrix;
-class Uniform;
-struct Color;
-
 /**
 Stores uniforms with a specific layout.  Both named and default uniform blocks
 are supported.

diff --git a/source/core/vertexarray.cpp b/source/core/vertexarray.cpp
index a13d79cc6b0abd3e0c42362b24dc56fc14e05d27..30bc9bcc6588ae9233fe7491cc30f49dcf403124 100644 (file)
--- a/source/core/vertexarray.cpp
+++ b/source/core/vertexarray.cpp
@@ -1,9 +1,4 @@
-#include <msp/gl/extensions/arb_multitexture.h>
-#include <msp/gl/extensions/arb_vertex_shader.h>
-#include "buffer.h"
 #include "error.h"
-#include "gl.h"
-#include "mesh.h"
 #include "vertexarray.h"
 
 using namespace std;

diff --git a/source/core/vertexarray.h b/source/core/vertexarray.h
index 55ee8d24ae10cb1bff4a4259c3f32d4d1f88aec4..290fa10c455f07b56f95c6ab0da3cfa9cc8f5fab 100644 (file)
--- a/source/core/vertexarray.h
+++ b/source/core/vertexarray.h
@@ -1,21 +1,15 @@
 #ifndef MSP_GL_VERTEXARRAY_H_
 #define MSP_GL_VERTEXARRAY_H_
 
-#include <climits>
 #include <vector>
-#include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
 #include "bufferable.h"
-#include "datatype.h"
-#include "primitivetype.h"
 #include "vertexarraybuilder.h"
 #include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class Buffer;
-
 /**
 Stores vertex data.
 

diff --git a/source/core/vertexformat.cpp b/source/core/vertexformat.cpp
index 8e358acd2d0394992925f05b26acd632b4427845..b95da9d1af0a94ad94ae64a554a6e8f04c131879 100644 (file)
--- a/source/core/vertexformat.cpp
+++ b/source/core/vertexformat.cpp
@@ -1,8 +1,4 @@
-#include <algorithm>
-#include <msp/io/print.h>
 #include <msp/strings/format.h>
-#include <msp/strings/lexicalcast.h>
-#include <msp/strings/utils.h>
 #include "error.h"
 #include "vertexformat.h"
 

diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index 7c2fd87f35df235c30d3d673d7626c3d2fd6a95f..f73e288984fa815fd440cff68a3187ecb02e44d0 100644 (file)
--- a/source/core/vertexsetup.cpp
+++ b/source/core/vertexsetup.cpp
@@ -1,4 +1,3 @@
-#include <msp/core/raii.h>
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_instanced_arrays.h>
 #include <msp/gl/extensions/arb_vertex_array_object.h>
@@ -10,7 +9,6 @@
 #include "buffer.h"
 #include "deviceinfo.h"
 #include "error.h"
-#include "gl.h"
 #include "vertexarray.h"
 #include "vertexsetup.h"