Break some of the include chains that cause unneeded dependencies between headers.

src/libEGL/libEGL.cpp

@@ -13,6 +13,7 @@
 #include "libGLESv2/Context.h"
 #include "libGLESv2/Texture.h"
 #include "libGLESv2/main.h"
+#include "libGLESv2/renderer/SwapChain.h"
 
 #include "libEGL/main.h"
 #include "libEGL/Display.h"

src/libGLESv2/Buffer.cpp

@@ -11,6 +11,9 @@
 #include "libGLESv2/Buffer.h"
 
 #include "libGLESv2/main.h"
+#include "libGLESv2/renderer/VertexBuffer.h"
+#include "libGLESv2/renderer/IndexBuffer.h"
+#include "libGLESv2/renderer/BufferStorage.h"
 
 namespace gl
 {

src/libGLESv2/Buffer.h

@@ -19,10 +19,14 @@
 
 #include "common/angleutils.h"
 #include "common/RefCountObject.h"
-#include "libGLESv2/renderer/IndexBuffer.h"
-#include "libGLESv2/renderer/Renderer.h"
-#include "libGLESv2/renderer/VertexBuffer.h"
-#include "libGLESv2/renderer/BufferStorage.h"
+
+namespace rx
+{
+class Renderer;
+class BufferStorage;
+class StaticIndexBufferInterface;
+class StaticVertexBufferInterface;
+};
 
 namespace gl
 {

src/libGLESv2/Context.cpp

@@ -26,6 +26,7 @@
 #include "libGLESv2/Shader.h"
 #include "libGLESv2/Texture.h"
 #include "libGLESv2/renderer/IndexDataManager.h"
+#include "libGLESv2/renderer/RenderTarget.h"
 
 #undef near
 #undef far

src/libGLESv2/Context.h

@@ -26,11 +26,13 @@
 
 #include "common/angleutils.h"
 #include "common/RefCountObject.h"
-#include "libGLESv2/ResourceManager.h"
 #include "libGLESv2/HandleAllocator.h"
 #include "libGLESv2/angletypes.h"
-#include "libGLESv2/renderer/Renderer.h"
-#include "libGLESv2/renderer/SwapChain.h"
+
+namespace rx
+{
+class Renderer;
+}
 
 namespace egl
 {
@@ -55,6 +57,8 @@ class Stencilbuffer;
 class DepthStencilbuffer;
 class Fence;
 class Query;
+class ResourceManager;
+class Buffer;
 
 enum
 {

src/libGLESv2/Program.cpp

@@ -7,6 +7,7 @@
 // Program.cpp: Implements the gl::Program class. Implements GL program objects
 // and related functionality. [OpenGL ES 2.0.24] section 2.10.3 page 28.
 
+#include "libGLESv2/Program.h"
 #include "libGLESv2/ProgramBinary.h"
 
 #include "common/debug.h"

src/libGLESv2/ProgramBinary.cpp

@@ -9,12 +9,15 @@
 
 #include "libGLESv2/BinaryStream.h"
 #include "libGLESv2/ProgramBinary.h"
+#include "libGLESv2/renderer/ShaderExecutable.h"
 
 #include "common/debug.h"
 #include "common/version.h"
+#include "utilities.h"
 
 #include "libGLESv2/main.h"
 #include "libGLESv2/Shader.h"
+#include "libGLESv2/Program.h"
 
 #include <string>
 

src/libGLESv2/ProgramBinary.h

@@ -17,18 +17,26 @@
 #include <string>
 #include <vector>
 
-#include "libGLESv2/Program.h"
-#include "libGLESv2/Context.h"
+#include "common/RefCountObject.h"
+#include "angletypes.h"
 #include "libGLESv2/mathutil.h"
-#include "libGLESv2/Shader.h"
 #include "libGLESv2/Uniform.h"
+#include "libGLESv2/Shader.h"
+#include "Context.h"
 
-#include "libGLESv2/renderer/ShaderExecutable.h"
+namespace rx
+{
+class ShaderExecutable;
+class Renderer;
+}
 
 namespace gl
 {
 class FragmentShader;
 class VertexShader;
+class InfoLog;
+class AttributeBindings;
+struct Varying;
 
 // Struct used for correlating uniforms/elements of uniform arrays to handles
 struct UniformLocation

src/libGLESv2/Renderbuffer.cpp

@@ -9,6 +9,7 @@
 // objects and related functionality. [OpenGL ES 2.0.24] section 4.4.3 page 108.
 
 #include "libGLESv2/Renderbuffer.h"
+#include "libGLESv2/renderer/RenderTarget.h"
 
 #include "libGLESv2/main.h"
 #include "libGLESv2/Texture.h"

src/libGLESv2/Renderbuffer.h

@@ -18,12 +18,11 @@
 #include "common/angleutils.h"
 #include "common/RefCountObject.h"
 
-#include "renderer/SwapChain.h"
-#include "renderer/RenderTarget.h"
-
 namespace rx
 {
 class Renderer;
+class SwapChain;
+class RenderTarget;
 }
 
 namespace gl

src/libGLESv2/renderer/Blit.cpp

@@ -16,6 +16,7 @@
 #include "libGLESv2/renderer/TextureStorage9.h"
 #include "libGLESv2/renderer/RenderTarget9.h"
 #include "libGLESv2/Framebuffer.h"
+#include "libGLESv2/Renderbuffer.h"
 
 namespace
 {

src/libGLESv2/renderer/IndexDataManager.cpp

@@ -8,6 +8,7 @@
 // runs the Buffer translation process for index buffers.
 
 #include "libGLESv2/renderer/IndexDataManager.h"
+#include "libGLESv2/renderer/BufferStorage.h"
 
 #include "common/debug.h"
 

src/libGLESv2/renderer/Renderer.cpp

@@ -11,6 +11,7 @@
 #include "libGLESv2/renderer/Renderer.h"
 #include "libGLESv2/renderer/Renderer9.h"
 #include "libGLESv2/renderer/Renderer11.h"
+#include "libGLESv2/utilities.h"
 
 #if !defined(ANGLE_ENABLE_D3D11)
 // Enables use of the Direct3D 11 API, when available

src/libGLESv2/renderer/Renderer.h

@@ -18,12 +18,9 @@
 
 #include <D3Dcompiler.h>
 
-#include "libGLESv2/Texture.h"
 #include "libGLESv2/Uniform.h"
 #include "libGLESv2/angletypes.h"
 
-#include "libGLESv2/renderer/ShaderExecutable.h"
-
 const int versionWindowsVista = MAKEWORD(0x00, 0x06);
 const int versionWindows7 = MAKEWORD(0x01, 0x06);
 
@@ -48,6 +45,8 @@ class InfoLog;
 class ProgramBinary;
 class VertexAttribute;
 class Buffer;
+class Texture;
+class Framebuffer;
 }
 
 namespace rx
@@ -61,6 +60,11 @@ class FenceImpl;
 class BufferStorage;
 class Blit;
 struct TranslatedIndexData;
+class ShaderExecutable;
+class SwapChain;
+class RenderTarget;
+class Image;
+class TextureStorage;
 
 struct ConfigDesc
 {

src/libGLESv2/renderer/Renderer11.h

@@ -26,6 +26,7 @@
 #include "libGLESv2/renderer/Renderer.h"
 #include "libGLESv2/renderer/RenderStateCache.h"
 #include "libGLESv2/renderer/InputLayoutCache.h"
+#include "libGLESv2/renderer/RenderTarget.h"
 
 namespace rx
 {

src/libGLESv2/renderer/Renderer9.cpp

@@ -11,6 +11,7 @@
 #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/ProgramBinary.h"

src/libGLESv2/renderer/Renderer9.h

@@ -28,6 +28,7 @@
 #include "libGLESv2/renderer/VertexDeclarationCache.h"
 #include "libGLESv2/renderer/Renderer.h"
 #include "libGLESv2/renderer/IndexDataManager.h"
+#include "libGLESv2/renderer/RenderTarget.h"
 
 namespace rx
 {

src/libGLESv2/renderer/TextureStorage.cpp

@@ -13,6 +13,8 @@
 #include "libGLESv2/renderer/SwapChain.h"
 #include "libGLESv2/renderer/Blit.h"
 #include "libGLESv2/renderer/RenderTarget.h"
+#include "libGLESv2/Renderbuffer.h"
+#include "libGLESv2/Texture.h"
 
 #include "common/debug.h"
 

src/libGLESv2/renderer/TextureStorage9.cpp

@@ -14,6 +14,7 @@
 #include "libGLESv2/renderer/Blit.h"
 #include "libGLESv2/renderer/RenderTarget9.h"
 #include "libGLESv2/renderer/renderer9_utils.h"
+#include "libGLESv2/Texture.h"
 
 #include "common/debug.h"
 

src/libGLESv2/renderer/VertexBuffer.cpp

@@ -8,6 +8,8 @@
 // class with derivations, classes that perform graphics API agnostic vertex buffer operations.
 
 #include "libGLESv2/renderer/VertexBuffer.h"
+#include "libGLESv2/renderer/Renderer.h"
+#include "libGLESv2/Context.h"
 
 namespace rx
 {

src/libGLESv2/renderer/VertexBuffer.h

@@ -16,11 +16,16 @@
 #define GL_APICALL
 #include <GLES2/gl2.h>
 
-#include "libGLESv2/Context.h"
-#include "libGLESv2/renderer/Renderer.h"
+#include "common/angleutils.h"
+
+namespace gl
+{
+class VertexAttribute;
+}
 
 namespace rx
 {
+class Renderer;
 
 class VertexBuffer
 {

src/libGLESv2/renderer/VertexBuffer11.cpp

@@ -7,6 +7,7 @@
 // VertexBuffer11.cpp: Defines the D3D11 VertexBuffer implementation.
 
 #include "libGLESv2/renderer/VertexBuffer11.h"
+#include "libGLESv2/renderer/BufferStorage.h"
 
 #include "libGLESv2/Buffer.h"
 

src/libGLESv2/renderer/VertexBuffer9.cpp

@@ -8,6 +8,7 @@
 
 #include "libGLESv2/renderer/VertexBuffer9.h"
 #include "libGLESv2/renderer/vertexconversion.h"
+#include "libGLESv2/renderer/BufferStorage.h"
 
 #include "libGLESv2/Buffer.h"
 

src/libGLESv2/renderer/VertexDataManager.cpp

@@ -8,6 +8,7 @@
 // runs the Buffer translation process.
 
 #include "libGLESv2/renderer/VertexDataManager.h"
+#include "libGLESv2/renderer/BufferStorage.h"
 
 #include "common/debug.h"
 
@@ -18,6 +19,7 @@
 
 #include "libGLESv2/renderer/vertexconversion.h"
 #include "libGLESv2/renderer/IndexDataManager.h"
+#include "libGLESv2/renderer/VertexBuffer.h"
 
 #include <limits>
 

src/libGLESv2/renderer/VertexDataManager.h

@@ -17,10 +17,12 @@
 #include <GLES2/gl2.h>
 
 #include "libGLESv2/Context.h"
-#include "libGLESv2/renderer/VertexBuffer.h"
 
 namespace rx
 {
+class BufferStorage;
+class StreamingVertexBufferInterface;
+class VertexBuffer;
 
 struct TranslatedAttribute
 {