Remove a lot of unnecessary include files and break include chains.
This should speed up incremental compile times when modifying headers, by reducing the number of dependencies.
TRAC #22518
Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods
Author: Jamie Madill
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1937 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/renderer/Blit.cpp b/src/libGLESv2/renderer/Blit.cpp
index 81e2a6b..6d56fd1 100644
--- a/src/libGLESv2/renderer/Blit.cpp
+++ b/src/libGLESv2/renderer/Blit.cpp
@@ -8,13 +8,11 @@
#include "libGLESv2/renderer/Blit.h"
-#include "common/debug.h"
-
#include "libGLESv2/main.h"
-#include "libGLESv2/utilities.h"
#include "libGLESv2/renderer/renderer9_utils.h"
#include "libGLESv2/renderer/TextureStorage9.h"
#include "libGLESv2/renderer/RenderTarget9.h"
+#include "libGLESv2/renderer/Renderer9.h"
#include "libGLESv2/Framebuffer.h"
#include "libGLESv2/Renderbuffer.h"
diff --git a/src/libGLESv2/renderer/Blit.h b/src/libGLESv2/renderer/Blit.h
index eb377b1..108b895 100644
--- a/src/libGLESv2/renderer/Blit.h
+++ b/src/libGLESv2/renderer/Blit.h
@@ -18,11 +18,17 @@
#include "common/angleutils.h"
-#include "libGLESv2/Context.h"
-#include "libGLESv2/renderer/Renderer9.h"
+namespace gl
+{
+class Framebuffer;
+}
namespace rx
{
+class Renderer9;
+class TextureStorageInterface2D;
+class TextureStorageInterfaceCube;
+
class Blit
{
public:
diff --git a/src/libGLESv2/renderer/BufferStorage11.cpp b/src/libGLESv2/renderer/BufferStorage11.cpp
index 0111ff0..1b09942 100644
--- a/src/libGLESv2/renderer/BufferStorage11.cpp
+++ b/src/libGLESv2/renderer/BufferStorage11.cpp
@@ -8,6 +8,7 @@
#include "libGLESv2/renderer/BufferStorage11.h"
#include "libGLESv2/main.h"
+#include "libGLESv2/renderer/Renderer11.h"
namespace rx
{
diff --git a/src/libGLESv2/renderer/BufferStorage11.h b/src/libGLESv2/renderer/BufferStorage11.h
index 1225972..4a5556f 100644
--- a/src/libGLESv2/renderer/BufferStorage11.h
+++ b/src/libGLESv2/renderer/BufferStorage11.h
@@ -10,12 +10,12 @@
#define LIBGLESV2_RENDERER_BUFFERSTORAGE11_H_
#include "libGLESv2/renderer/BufferStorage.h"
-#include "libGLESv2/renderer/Renderer11.h"
#include <D3D11.h>
namespace rx
{
+class Renderer11;
class BufferStorage11 : public BufferStorage
{
diff --git a/src/libGLESv2/renderer/BufferStorage9.cpp b/src/libGLESv2/renderer/BufferStorage9.cpp
index b7cafd2..fd4fce8 100644
--- a/src/libGLESv2/renderer/BufferStorage9.cpp
+++ b/src/libGLESv2/renderer/BufferStorage9.cpp
@@ -7,10 +7,8 @@
// BufferStorage9.cpp Defines the BufferStorage9 class.
#include "libGLESv2/renderer/BufferStorage9.h"
-#include "libGLESv2/main.h"
#include "common/debug.h"
-#include <stdlib.h>
-#include <string.h>
+#include <algorithm> // for std::min and std::max
namespace rx
{
diff --git a/src/libGLESv2/renderer/Fence11.cpp b/src/libGLESv2/renderer/Fence11.cpp
index 2ed7975..92bd3a4 100644
--- a/src/libGLESv2/renderer/Fence11.cpp
+++ b/src/libGLESv2/renderer/Fence11.cpp
@@ -8,6 +8,7 @@
#include "libGLESv2/renderer/Fence11.h"
#include "libGLESv2/main.h"
+#include "libGLESv2/renderer/Renderer11.h"
namespace rx
{
diff --git a/src/libGLESv2/renderer/Fence11.h b/src/libGLESv2/renderer/Fence11.h
index bb33401..37fa534 100644
--- a/src/libGLESv2/renderer/Fence11.h
+++ b/src/libGLESv2/renderer/Fence11.h
@@ -10,10 +10,12 @@
#define LIBGLESV2_RENDERER_Fence11_H_
#include "libGLESv2/renderer/FenceImpl.h"
-#include "libGLESv2/renderer/Renderer11.h"
+
+#include <D3D11.h>
namespace rx
{
+class Renderer11;
class Fence11 : public FenceImpl
{
diff --git a/src/libGLESv2/renderer/Fence9.cpp b/src/libGLESv2/renderer/Fence9.cpp
index 74abfcf..165fe52 100644
--- a/src/libGLESv2/renderer/Fence9.cpp
+++ b/src/libGLESv2/renderer/Fence9.cpp
@@ -9,6 +9,7 @@
#include "libGLESv2/renderer/Fence9.h"
#include "libGLESv2/main.h"
#include "libGLESv2/renderer/renderer9_utils.h"
+#include "libGLESv2/renderer/Renderer9.h"
namespace rx
{
diff --git a/src/libGLESv2/renderer/Fence9.h b/src/libGLESv2/renderer/Fence9.h
index 28b2694..6d17263 100644
--- a/src/libGLESv2/renderer/Fence9.h
+++ b/src/libGLESv2/renderer/Fence9.h
@@ -10,10 +10,12 @@
#define LIBGLESV2_RENDERER_FENCE9_H_
#include "libGLESv2/renderer/FenceImpl.h"
-#include "libGLESv2/renderer/Renderer9.h"
+
+#include <d3d9.h>
namespace rx
{
+class Renderer9;
class Fence9 : public FenceImpl
{
diff --git a/src/libGLESv2/renderer/Image11.cpp b/src/libGLESv2/renderer/Image11.cpp
index 5eb58cb..53a726b 100644
--- a/src/libGLESv2/renderer/Image11.cpp
+++ b/src/libGLESv2/renderer/Image11.cpp
@@ -11,9 +11,10 @@
#include "libGLESv2/renderer/Image11.h"
#include "libGLESv2/renderer/TextureStorage11.h"
#include "libGLESv2/Framebuffer.h"
+#include "libGLESv2/Renderbuffer.h"
#include "libGLESv2/main.h"
-#include "libGLESv2/mathutil.h"
+#include "libGLESv2/utilities.h"
#include "libGLESv2/renderer/renderer11_utils.h"
#include "libGLESv2/renderer/generatemip.h"
diff --git a/src/libGLESv2/renderer/Image9.cpp b/src/libGLESv2/renderer/Image9.cpp
index 060fa20..e0b1cde 100644
--- a/src/libGLESv2/renderer/Image9.cpp
+++ b/src/libGLESv2/renderer/Image9.cpp
@@ -10,10 +10,8 @@
#include "libGLESv2/renderer/Image9.h"
#include "libGLESv2/main.h"
-#include "libGLESv2/mathutil.h"
-#include "libGLESv2/utilities.h"
-#include "libGLESv2/Texture.h"
#include "libGLESv2/Framebuffer.h"
+#include "libGLESv2/Renderbuffer.h"
#include "libGLESv2/renderer/Renderer9.h"
#include "libGLESv2/renderer/RenderTarget9.h"
#include "libGLESv2/renderer/TextureStorage9.h"
diff --git a/src/libGLESv2/renderer/IndexBuffer.cpp b/src/libGLESv2/renderer/IndexBuffer.cpp
index ba076f8..9059579 100644
--- a/src/libGLESv2/renderer/IndexBuffer.cpp
+++ b/src/libGLESv2/renderer/IndexBuffer.cpp
@@ -8,6 +8,7 @@
// class with derivations, classes that perform graphics API agnostic index buffer operations.
#include "libGLESv2/renderer/IndexBuffer.h"
+#include "libGLESv2/renderer/Renderer.h"
namespace rx
{
@@ -173,7 +174,7 @@
}
}
-UINT StaticIndexBufferInterface::lookupRange(intptr_t offset, GLsizei count, UINT *minIndex, UINT *maxIndex)
+unsigned int StaticIndexBufferInterface::lookupRange(intptr_t offset, GLsizei count, unsigned int *minIndex, unsigned int *maxIndex)
{
IndexRange range = {offset, count};
@@ -189,7 +190,7 @@
return res->second.streamOffset;
}
-void StaticIndexBufferInterface::addRange(intptr_t offset, GLsizei count, UINT minIndex, UINT maxIndex, UINT streamOffset)
+void StaticIndexBufferInterface::addRange(intptr_t offset, GLsizei count, unsigned int minIndex, unsigned int maxIndex, unsigned int streamOffset)
{
IndexRange indexRange = {offset, count};
IndexResult indexResult = {minIndex, maxIndex, streamOffset};
diff --git a/src/libGLESv2/renderer/IndexBuffer.h b/src/libGLESv2/renderer/IndexBuffer.h
index a518d37..85418d4 100644
--- a/src/libGLESv2/renderer/IndexBuffer.h
+++ b/src/libGLESv2/renderer/IndexBuffer.h
@@ -15,10 +15,11 @@
#include <map>
-#include "libGLESv2/renderer/Renderer.h"
+#include "common/angleutils.h"
namespace rx
{
+class Renderer;
class IndexBuffer
{
@@ -103,8 +104,8 @@
virtual bool reserveBufferSpace(unsigned int size, GLenum indexType);
- UINT lookupRange(intptr_t offset, GLsizei count, UINT *minIndex, UINT *maxIndex); // Returns the offset into the index buffer, or -1 if not found
- void addRange(intptr_t offset, GLsizei count, UINT minIndex, UINT maxIndex, UINT streamOffset);
+ unsigned int lookupRange(intptr_t offset, GLsizei count, unsigned int *minIndex, unsigned int *maxIndex); // Returns the offset into the index buffer, or -1 if not found
+ void addRange(intptr_t offset, GLsizei count, unsigned int minIndex, unsigned int maxIndex, unsigned int streamOffset);
private:
struct IndexRange
@@ -128,9 +129,9 @@
struct IndexResult
{
- UINT minIndex;
- UINT maxIndex;
- UINT streamOffset;
+ unsigned int minIndex;
+ unsigned int maxIndex;
+ unsigned int streamOffset;
};
std::map<IndexRange, IndexResult> mCache;
diff --git a/src/libGLESv2/renderer/IndexBuffer11.cpp b/src/libGLESv2/renderer/IndexBuffer11.cpp
index 5936b13..9b3d2e6 100644
--- a/src/libGLESv2/renderer/IndexBuffer11.cpp
+++ b/src/libGLESv2/renderer/IndexBuffer11.cpp
@@ -7,6 +7,7 @@
// IndexBuffer11.cpp: Defines the D3D11 IndexBuffer implementation.
#include "libGLESv2/renderer/IndexBuffer11.h"
+#include "libGLESv2/renderer/Renderer11.h"
namespace rx
{
diff --git a/src/libGLESv2/renderer/IndexBuffer11.h b/src/libGLESv2/renderer/IndexBuffer11.h
index 658f1bc..169189d 100644
--- a/src/libGLESv2/renderer/IndexBuffer11.h
+++ b/src/libGLESv2/renderer/IndexBuffer11.h
@@ -10,12 +10,12 @@
#define LIBGLESV2_RENDERER_INDEXBUFFER11_H_
#include "libGLESv2/renderer/IndexBuffer.h"
-#include "libGLESv2/renderer/Renderer11.h"
#include <d3d11.h>
namespace rx
{
+class Renderer11;
class IndexBuffer11 : public IndexBuffer
{
diff --git a/src/libGLESv2/renderer/IndexBuffer9.cpp b/src/libGLESv2/renderer/IndexBuffer9.cpp
index 0472a13..e59efaf 100644
--- a/src/libGLESv2/renderer/IndexBuffer9.cpp
+++ b/src/libGLESv2/renderer/IndexBuffer9.cpp
@@ -7,6 +7,7 @@
// Indexffer9.cpp: Defines the D3D9 IndexBuffer implementation.
#include "libGLESv2/renderer/IndexBuffer9.h"
+#include "libGLESv2/renderer/Renderer9.h"
namespace rx
{
diff --git a/src/libGLESv2/renderer/IndexBuffer9.h b/src/libGLESv2/renderer/IndexBuffer9.h
index 2edf476..e00f1c7 100644
--- a/src/libGLESv2/renderer/IndexBuffer9.h
+++ b/src/libGLESv2/renderer/IndexBuffer9.h
@@ -10,12 +10,12 @@
#define LIBGLESV2_RENDERER_INDEXBUFFER9_H_
#include "libGLESv2/renderer/IndexBuffer.h"
-#include "libGLESv2/renderer/Renderer9.h"
#include <d3d9.h>
namespace rx
{
+class Renderer9;
class IndexBuffer9 : public IndexBuffer
{
diff --git a/src/libGLESv2/renderer/IndexDataManager.cpp b/src/libGLESv2/renderer/IndexDataManager.cpp
index 8f077c2..6d45f87 100644
--- a/src/libGLESv2/renderer/IndexDataManager.cpp
+++ b/src/libGLESv2/renderer/IndexDataManager.cpp
@@ -10,11 +10,9 @@
#include "libGLESv2/renderer/IndexDataManager.h"
#include "libGLESv2/renderer/BufferStorage.h"
-#include "common/debug.h"
-
#include "libGLESv2/Buffer.h"
-#include "libGLESv2/mathutil.h"
#include "libGLESv2/main.h"
+#include "libGLESv2/renderer/IndexBuffer.h"
namespace rx
{
diff --git a/src/libGLESv2/renderer/IndexDataManager.h b/src/libGLESv2/renderer/IndexDataManager.h
index fe9ca60..506cfdb 100644
--- a/src/libGLESv2/renderer/IndexDataManager.h
+++ b/src/libGLESv2/renderer/IndexDataManager.h
@@ -16,23 +16,32 @@
#define GL_APICALL
#include <GLES2/gl2.h>
-#include "libGLESv2/renderer/Renderer.h"
-#include "libGLESv2/renderer/IndexBuffer.h"
+#include "common/angleutils.h"
namespace
{
enum { INITIAL_INDEX_BUFFER_SIZE = 4096 * sizeof(GLuint) };
}
+namespace gl
+{
+class Buffer;
+}
+
namespace rx
{
+class StaticIndexBufferInterface;
+class StreamingIndexBufferInterface;
+class IndexBuffer;
+class BufferStorage;
+class Renderer;
struct TranslatedIndexData
{
- UINT minIndex;
- UINT maxIndex;
- UINT startIndex;
- UINT startOffset; // In bytes
+ unsigned int minIndex;
+ unsigned int maxIndex;
+ unsigned int startIndex;
+ unsigned int startOffset; // In bytes
IndexBuffer *indexBuffer;
BufferStorage *storage;
diff --git a/src/libGLESv2/renderer/InputLayoutCache.cpp b/src/libGLESv2/renderer/InputLayoutCache.cpp
index 965f2b9..3ac0995 100644
--- a/src/libGLESv2/renderer/InputLayoutCache.cpp
+++ b/src/libGLESv2/renderer/InputLayoutCache.cpp
@@ -12,6 +12,8 @@
#include "libGLESv2/renderer/BufferStorage11.h"
#include "libGLESv2/renderer/ShaderExecutable11.h"
#include "libGLESv2/ProgramBinary.h"
+#include "libGLESv2/Context.h"
+#include "libGLESv2/renderer/VertexDataManager.h"
#include "third_party/murmurhash/MurmurHash3.h"
diff --git a/src/libGLESv2/renderer/InputLayoutCache.h b/src/libGLESv2/renderer/InputLayoutCache.h
index 375d4f8..cc952ab 100644
--- a/src/libGLESv2/renderer/InputLayoutCache.h
+++ b/src/libGLESv2/renderer/InputLayoutCache.h
@@ -10,15 +10,23 @@
#ifndef LIBGLESV2_RENDERER_INPUTLAYOUTCACHE_H_
#define LIBGLESV2_RENDERER_INPUTLAYOUTCACHE_H_
-#include "libGLESv2/Context.h"
+#include "libGLESv2/Constants.h"
+#include "common/angleutils.h"
-#include "libGLESv2/renderer/VertexDataManager.h"
+#define GL_APICALL
+#include <GLES2/gl2.h>
#include <D3D11.h>
#include <unordered_map>
+namespace gl
+{
+class ProgramBinary;
+}
+
namespace rx
{
+struct TranslatedAttribute;
class InputLayoutCache
{
diff --git a/src/libGLESv2/renderer/Query11.cpp b/src/libGLESv2/renderer/Query11.cpp
index 629b27d..06fbf76 100644
--- a/src/libGLESv2/renderer/Query11.cpp
+++ b/src/libGLESv2/renderer/Query11.cpp
@@ -7,6 +7,7 @@
// Query11.cpp: Defines the rx::Query11 class which implements rx::QueryImpl.
#include "libGLESv2/renderer/Query11.h"
+#include "libGLESv2/renderer/Renderer11.h"
#include "libGLESv2/main.h"
namespace rx
diff --git a/src/libGLESv2/renderer/Query11.h b/src/libGLESv2/renderer/Query11.h
index 88994a5..da2d4c8 100644
--- a/src/libGLESv2/renderer/Query11.h
+++ b/src/libGLESv2/renderer/Query11.h
@@ -10,10 +10,11 @@
#define LIBGLESV2_RENDERER_QUERY11_H_
#include "libGLESv2/renderer/QueryImpl.h"
-#include "libGLESv2/renderer/Renderer11.h"
+#include <D3D11.h>
namespace rx
{
+class Renderer11;
class Query11 : public QueryImpl
{
diff --git a/src/libGLESv2/renderer/Query9.cpp b/src/libGLESv2/renderer/Query9.cpp
index 0d1b9a9..e34424f 100644
--- a/src/libGLESv2/renderer/Query9.cpp
+++ b/src/libGLESv2/renderer/Query9.cpp
@@ -10,6 +10,7 @@
#include "libGLESv2/renderer/Query9.h"
#include "libGLESv2/main.h"
#include "libGLESv2/renderer/renderer9_utils.h"
+#include "libGLESv2/renderer/Renderer9.h"
namespace rx
{
diff --git a/src/libGLESv2/renderer/Query9.h b/src/libGLESv2/renderer/Query9.h
index b177fdf..1573211 100644
--- a/src/libGLESv2/renderer/Query9.h
+++ b/src/libGLESv2/renderer/Query9.h
@@ -10,10 +10,12 @@
#define LIBGLESV2_RENDERER_QUERY9_H_
#include "libGLESv2/renderer/QueryImpl.h"
-#include "libGLESv2/renderer/Renderer9.h"
+
+#include <d3d9.h>
namespace rx
{
+class Renderer9;
class Query9 : public QueryImpl
{
diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index 4ca5285..da561c2 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -8,14 +8,12 @@
#include <D3Dcompiler.h>
-#include "common/debug.h"
#include "libGLESv2/main.h"
#include "libGLESv2/utilities.h"
-#include "libGLESv2/mathutil.h"
#include "libGLESv2/Buffer.h"
-#include "libGLESv2/Program.h"
#include "libGLESv2/ProgramBinary.h"
#include "libGLESv2/Framebuffer.h"
+#include "libGLESv2/RenderBuffer.h"
#include "libGLESv2/renderer/Renderer11.h"
#include "libGLESv2/renderer/RenderTarget11.h"
#include "libGLESv2/renderer/renderer11_utils.h"
@@ -40,6 +38,8 @@
#include "libGLESv2/renderer/shaders/compiled/clear11vs.h"
#include "libGLESv2/renderer/shaders/compiled/clear11ps.h"
+#include "libEGL/Display.h"
+
#include <sstream>
namespace rx
diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index d399288..a863a79 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -8,17 +8,13 @@
#include <D3Dcompiler.h>
-#include "common/debug.h"
#include "libGLESv2/main.h"
-#include "libGLESv2/utilities.h"
-#include "libGLESv2/mathutil.h"
#include "libGLESv2/Buffer.h"
#include "libGLESv2/Texture.h"
#include "libGLESv2/Framebuffer.h"
-#include "libGLESv2/Program.h"
+#include "libGLESv2/Renderbuffer.h"
#include "libGLESv2/ProgramBinary.h"
#include "libGLESv2/renderer/IndexDataManager.h"
-#include "libGLESv2/renderer/VertexDataManager.h"
#include "libGLESv2/renderer/Renderer9.h"
#include "libGLESv2/renderer/renderer9_utils.h"
#include "libGLESv2/renderer/ShaderExecutable9.h"
@@ -33,6 +29,8 @@
#include "libGLESv2/renderer/Query9.h"
#include "libGLESv2/renderer/Fence9.h"
+#include "libEGL/Display.h"
+
#include <sstream>
// Can also be enabled by defining FORCE_REF_RAST in the project's predefined macros
diff --git a/src/libGLESv2/renderer/Renderer9.h b/src/libGLESv2/renderer/Renderer9.h
index c36ab4a..5ea2305 100644
--- a/src/libGLESv2/renderer/Renderer9.h
+++ b/src/libGLESv2/renderer/Renderer9.h
@@ -23,16 +23,20 @@
#include "common/angleutils.h"
#include "libGLESv2/mathutil.h"
-#include "libGLESv2/Context.h"
#include "libGLESv2/renderer/ShaderCache.h"
#include "libGLESv2/renderer/VertexDeclarationCache.h"
#include "libGLESv2/renderer/Renderer.h"
-#include "libGLESv2/renderer/IndexDataManager.h"
#include "libGLESv2/renderer/RenderTarget.h"
+namespace gl
+{
+class Renderbuffer;
+}
+
namespace rx
{
class VertexDataManager;
+class IndexDataManager;
class StreamingIndexBufferInterface;
struct TranslatedAttribute;
diff --git a/src/libGLESv2/renderer/SwapChain11.cpp b/src/libGLESv2/renderer/SwapChain11.cpp
index cb927e1..275bf7a 100644
--- a/src/libGLESv2/renderer/SwapChain11.cpp
+++ b/src/libGLESv2/renderer/SwapChain11.cpp
@@ -8,13 +8,8 @@
#include "libGLESv2/renderer/SwapChain11.h"
-#include "common/debug.h"
-#include "libGLESv2/utilities.h"
#include "libGLESv2/renderer/renderer11_utils.h"
#include "libGLESv2/renderer/Renderer11.h"
-#include "libGLESv2/Context.h"
-#include "libGLESv2/main.h"
-
#include "libGLESv2/renderer/shaders/compiled/passthrough11vs.h"
#include "libGLESv2/renderer/shaders/compiled/passthroughrgba11ps.h"
diff --git a/src/libGLESv2/renderer/SwapChain9.cpp b/src/libGLESv2/renderer/SwapChain9.cpp
index 8b3223d..4e6b637 100644
--- a/src/libGLESv2/renderer/SwapChain9.cpp
+++ b/src/libGLESv2/renderer/SwapChain9.cpp
@@ -7,14 +7,8 @@
// SwapChain9.cpp: Implements a back-end specific class for the D3D9 swap chain.
#include "libGLESv2/renderer/SwapChain9.h"
-
-#include "common/debug.h"
-#include "libGLESv2/utilities.h"
#include "libGLESv2/renderer/renderer9_utils.h"
#include "libGLESv2/renderer/Renderer9.h"
-#include "libGLESv2/renderer/RenderTarget9.h"
-#include "libGLESv2/Context.h"
-#include "libGLESv2/main.h"
namespace rx
{
diff --git a/src/libGLESv2/renderer/TextureStorage.cpp b/src/libGLESv2/renderer/TextureStorage.cpp
index b473615..32d560e 100644
--- a/src/libGLESv2/renderer/TextureStorage.cpp
+++ b/src/libGLESv2/renderer/TextureStorage.cpp
@@ -8,11 +8,8 @@
// classes TextureStorageInterface2D and TextureStorageInterfaceCube, which act as the interface to the
// GPU-side texture.
-#include "libGLESv2/main.h"
#include "libGLESv2/renderer/TextureStorage.h"
-#include "libGLESv2/renderer/SwapChain.h"
-#include "libGLESv2/renderer/Blit.h"
-#include "libGLESv2/renderer/RenderTarget.h"
+#include "libGLESv2/renderer/Renderer.h"
#include "libGLESv2/Renderbuffer.h"
#include "libGLESv2/Texture.h"
diff --git a/src/libGLESv2/renderer/TextureStorage11.cpp b/src/libGLESv2/renderer/TextureStorage11.cpp
index ecb2b3a..899267a 100644
--- a/src/libGLESv2/renderer/TextureStorage11.cpp
+++ b/src/libGLESv2/renderer/TextureStorage11.cpp
@@ -14,6 +14,7 @@
#include "libGLESv2/renderer/SwapChain11.h"
#include "libGLESv2/renderer/renderer11_utils.h"
+#include "libGLESv2/utilities.h"
#include "libGLESv2/main.h"
namespace rx
diff --git a/src/libGLESv2/renderer/TextureStorage9.cpp b/src/libGLESv2/renderer/TextureStorage9.cpp
index b240c46..74dcda9 100644
--- a/src/libGLESv2/renderer/TextureStorage9.cpp
+++ b/src/libGLESv2/renderer/TextureStorage9.cpp
@@ -9,15 +9,13 @@
// D3D9 texture.
#include "libGLESv2/main.h"
+#include "libGLESv2/renderer/Renderer9.h"
#include "libGLESv2/renderer/TextureStorage9.h"
#include "libGLESv2/renderer/SwapChain9.h"
-#include "libGLESv2/renderer/Blit.h"
#include "libGLESv2/renderer/RenderTarget9.h"
#include "libGLESv2/renderer/renderer9_utils.h"
#include "libGLESv2/Texture.h"
-#include "common/debug.h"
-
namespace rx
{
TextureStorage9::TextureStorage9(Renderer *renderer, DWORD usage)
diff --git a/src/libGLESv2/renderer/VertexBuffer11.cpp b/src/libGLESv2/renderer/VertexBuffer11.cpp
index cc788cf..e8e09d5 100644
--- a/src/libGLESv2/renderer/VertexBuffer11.cpp
+++ b/src/libGLESv2/renderer/VertexBuffer11.cpp
@@ -10,6 +10,8 @@
#include "libGLESv2/renderer/BufferStorage.h"
#include "libGLESv2/Buffer.h"
+#include "libGLESv2/renderer/Renderer11.h"
+#include "libGLESv2/Context.h"
namespace rx
{
diff --git a/src/libGLESv2/renderer/VertexBuffer11.h b/src/libGLESv2/renderer/VertexBuffer11.h
index 416b5c5..66a2ea0 100644
--- a/src/libGLESv2/renderer/VertexBuffer11.h
+++ b/src/libGLESv2/renderer/VertexBuffer11.h
@@ -10,12 +10,12 @@
#define LIBGLESV2_RENDERER_VERTEXBUFFER11_H_
#include "libGLESv2/renderer/VertexBuffer.h"
-#include "libGLESv2/renderer/Renderer11.h"
#include <d3d11.h>
namespace rx
{
+class Renderer11;
class VertexBuffer11 : public VertexBuffer
{
diff --git a/src/libGLESv2/renderer/VertexBuffer9.cpp b/src/libGLESv2/renderer/VertexBuffer9.cpp
index 72f57e6..46133c8 100644
--- a/src/libGLESv2/renderer/VertexBuffer9.cpp
+++ b/src/libGLESv2/renderer/VertexBuffer9.cpp
@@ -9,11 +9,11 @@
#include "libGLESv2/renderer/VertexBuffer9.h"
#include "libGLESv2/renderer/vertexconversion.h"
#include "libGLESv2/renderer/BufferStorage.h"
+#include "libGLESv2/Context.h"
+#include "libGLESv2/renderer/Renderer9.h"
#include "libGLESv2/Buffer.h"
-#include <limits>
-
namespace rx
{
diff --git a/src/libGLESv2/renderer/VertexBuffer9.h b/src/libGLESv2/renderer/VertexBuffer9.h
index f3409d4..348eff8 100644
--- a/src/libGLESv2/renderer/VertexBuffer9.h
+++ b/src/libGLESv2/renderer/VertexBuffer9.h
@@ -10,12 +10,12 @@
#define LIBGLESV2_RENDERER_VERTEXBUFFER9_H_
#include "libGLESv2/renderer/VertexBuffer.h"
-#include "libGLESv2/renderer/Renderer9.h"
#include <d3d9.h>
namespace rx
{
+class Renderer9;
class VertexBuffer9 : public VertexBuffer
{
diff --git a/src/libGLESv2/renderer/VertexDataManager.cpp b/src/libGLESv2/renderer/VertexDataManager.cpp
index 46a6175..c39ca65 100644
--- a/src/libGLESv2/renderer/VertexDataManager.cpp
+++ b/src/libGLESv2/renderer/VertexDataManager.cpp
@@ -10,19 +10,11 @@
#include "libGLESv2/renderer/VertexDataManager.h"
#include "libGLESv2/renderer/BufferStorage.h"
-#include "common/debug.h"
-
-#include "libGLESv2/renderer/Renderer9.h"
#include "libGLESv2/Buffer.h"
#include "libGLESv2/ProgramBinary.h"
-#include "libGLESv2/main.h"
-
-#include "libGLESv2/renderer/vertexconversion.h"
-#include "libGLESv2/renderer/IndexDataManager.h"
+#include "libGLESv2/Context.h"
#include "libGLESv2/renderer/VertexBuffer.h"
-#include <limits>
-
namespace
{
enum { INITIAL_STREAM_BUFFER_SIZE = 1024*1024 };
diff --git a/src/libGLESv2/renderer/VertexDataManager.h b/src/libGLESv2/renderer/VertexDataManager.h
index 1395f2b..e37aade 100644
--- a/src/libGLESv2/renderer/VertexDataManager.h
+++ b/src/libGLESv2/renderer/VertexDataManager.h
@@ -16,13 +16,23 @@
#define GL_APICALL
#include <GLES2/gl2.h>
-#include "libGLESv2/Context.h"
+#include "libGLESv2/Constants.h"
+#include "common/angleutils.h"
+
+#include <D3D11.h>
+
+namespace gl
+{
+class VertexAttribute;
+class ProgramBinary;
+}
namespace rx
{
class BufferStorage;
class StreamingVertexBufferInterface;
class VertexBuffer;
+class Renderer;
struct TranslatedAttribute
{
diff --git a/src/libGLESv2/renderer/VertexDeclarationCache.cpp b/src/libGLESv2/renderer/VertexDeclarationCache.cpp
index a65a158..3f63073 100644
--- a/src/libGLESv2/renderer/VertexDeclarationCache.cpp
+++ b/src/libGLESv2/renderer/VertexDeclarationCache.cpp
@@ -7,8 +7,8 @@
// VertexDeclarationCache.cpp: Implements a helper class to construct and cache vertex declarations.
#include "libGLESv2/ProgramBinary.h"
+#include "libGLESv2/Context.h"
#include "libGLESv2/renderer/VertexBuffer9.h"
-#include "libGLESv2/renderer/VertexDataManager.h"
#include "libGLESv2/renderer/VertexDeclarationCache.h"
namespace rx
diff --git a/src/libGLESv2/renderer/VertexDeclarationCache.h b/src/libGLESv2/renderer/VertexDeclarationCache.h
index 4bfd0c6..3fc024a 100644
--- a/src/libGLESv2/renderer/VertexDeclarationCache.h
+++ b/src/libGLESv2/renderer/VertexDeclarationCache.h
@@ -9,7 +9,6 @@
#ifndef LIBGLESV2_RENDERER_VERTEXDECLARATIONCACHE_H_
#define LIBGLESV2_RENDERER_VERTEXDECLARATIONCACHE_H_
-#include "libGLESv2/Context.h"
#include "libGLESv2/renderer/VertexDataManager.h"
namespace gl
diff --git a/src/libGLESv2/renderer/renderer9_utils.h b/src/libGLESv2/renderer/renderer9_utils.h
index 6dedf01..02828da 100644
--- a/src/libGLESv2/renderer/renderer9_utils.h
+++ b/src/libGLESv2/renderer/renderer9_utils.h
@@ -16,7 +16,6 @@
#include <d3d9.h>
#include "libGLESv2/utilities.h"
-#include "libGLESv2/main.h"
const D3DFORMAT D3DFMT_INTZ = ((D3DFORMAT)(MAKEFOURCC('I','N','T','Z')));
const D3DFORMAT D3DFMT_NULL = ((D3DFORMAT)(MAKEFOURCC('N','U','L','L')));
diff --git a/src/libGLESv2/renderer/vertexconversion.h b/src/libGLESv2/renderer/vertexconversion.h
index d3d373b..2178ba2 100644
--- a/src/libGLESv2/renderer/vertexconversion.h
+++ b/src/libGLESv2/renderer/vertexconversion.h
@@ -13,8 +13,6 @@
#include <cstddef>
#include <limits>
-#include "libGLESv2/Context.h" // Defines Index
-
namespace rx
{