diff options
25 files changed, 71 insertions, 20 deletions
diff --git a/src/libEGL/libEGL.cpp b/src/libEGL/libEGL.cpp index 723fb91f..178ffe97 100644 --- a/src/libEGL/libEGL.cpp +++ b/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" diff --git a/src/libGLESv2/Buffer.cpp b/src/libGLESv2/Buffer.cpp index fce2c88b..5fc3d74e 100644 --- a/src/libGLESv2/Buffer.cpp +++ b/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 { diff --git a/src/libGLESv2/Buffer.h b/src/libGLESv2/Buffer.h index f56d1d36..e22c8f49 100644 --- a/src/libGLESv2/Buffer.h +++ b/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 { diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp index 0117df1e..b6e27808 100644 --- a/src/libGLESv2/Context.cpp +++ b/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 diff --git a/src/libGLESv2/Context.h b/src/libGLESv2/Context.h index f12cc246..8401a646 100644 --- a/src/libGLESv2/Context.h +++ b/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 { diff --git a/src/libGLESv2/Program.cpp b/src/libGLESv2/Program.cpp index dc61f50b..2a72e02c 100644 --- a/src/libGLESv2/Program.cpp +++ b/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" diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp index d17fd0da..3e903cfd 100644 --- a/src/libGLESv2/ProgramBinary.cpp +++ b/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> diff --git a/src/libGLESv2/ProgramBinary.h b/src/libGLESv2/ProgramBinary.h index d2ee73af..5ea4ee88 100644 --- a/src/libGLESv2/ProgramBinary.h +++ b/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 diff --git a/src/libGLESv2/Renderbuffer.cpp b/src/libGLESv2/Renderbuffer.cpp index 37afc9d2..5b559b74 100644 --- a/src/libGLESv2/Renderbuffer.cpp +++ b/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" diff --git a/src/libGLESv2/Renderbuffer.h b/src/libGLESv2/Renderbuffer.h index 4e0db279..eca2f3a7 100644 --- a/src/libGLESv2/Renderbuffer.h +++ b/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 diff --git a/src/libGLESv2/renderer/Blit.cpp b/src/libGLESv2/renderer/Blit.cpp index 74c44803..81e2a6b0 100644 --- a/src/libGLESv2/renderer/Blit.cpp +++ b/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 { diff --git a/src/libGLESv2/renderer/IndexDataManager.cpp b/src/libGLESv2/renderer/IndexDataManager.cpp index 783e46a7..8f077c28 100644 --- a/src/libGLESv2/renderer/IndexDataManager.cpp +++ b/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" diff --git a/src/libGLESv2/renderer/Renderer.cpp b/src/libGLESv2/renderer/Renderer.cpp index 92efd3e1..9a0e7454 100644 --- a/src/libGLESv2/renderer/Renderer.cpp +++ b/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 diff --git a/src/libGLESv2/renderer/Renderer.h b/src/libGLESv2/renderer/Renderer.h index 838e123c..384264da 100644 --- a/src/libGLESv2/renderer/Renderer.h +++ b/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 { diff --git a/src/libGLESv2/renderer/Renderer11.h b/src/libGLESv2/renderer/Renderer11.h index e7822359..61c532ef 100644 --- a/src/libGLESv2/renderer/Renderer11.h +++ b/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 { diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp index c137817a..13f352e8 100644 --- a/src/libGLESv2/renderer/Renderer9.cpp +++ b/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" diff --git a/src/libGLESv2/renderer/Renderer9.h b/src/libGLESv2/renderer/Renderer9.h index cd9b7b27..3b375d90 100644 --- a/src/libGLESv2/renderer/Renderer9.h +++ b/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 { diff --git a/src/libGLESv2/renderer/TextureStorage.cpp b/src/libGLESv2/renderer/TextureStorage.cpp index 256c301d..b4736151 100644 --- a/src/libGLESv2/renderer/TextureStorage.cpp +++ b/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" diff --git a/src/libGLESv2/renderer/TextureStorage9.cpp b/src/libGLESv2/renderer/TextureStorage9.cpp index 14a5e741..b240c466 100644 --- a/src/libGLESv2/renderer/TextureStorage9.cpp +++ b/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" diff --git a/src/libGLESv2/renderer/VertexBuffer.cpp b/src/libGLESv2/renderer/VertexBuffer.cpp index 7ffe2da7..5c8ddc85 100644 --- a/src/libGLESv2/renderer/VertexBuffer.cpp +++ b/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 { diff --git a/src/libGLESv2/renderer/VertexBuffer.h b/src/libGLESv2/renderer/VertexBuffer.h index 6a53b216..b2fea12f 100644 --- a/src/libGLESv2/renderer/VertexBuffer.h +++ b/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 { diff --git a/src/libGLESv2/renderer/VertexBuffer11.cpp b/src/libGLESv2/renderer/VertexBuffer11.cpp index a6596e36..cc788cf3 100644 --- a/src/libGLESv2/renderer/VertexBuffer11.cpp +++ b/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" diff --git a/src/libGLESv2/renderer/VertexBuffer9.cpp b/src/libGLESv2/renderer/VertexBuffer9.cpp index 4f113110..e0ce811f 100644 --- a/src/libGLESv2/renderer/VertexBuffer9.cpp +++ b/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" diff --git a/src/libGLESv2/renderer/VertexDataManager.cpp b/src/libGLESv2/renderer/VertexDataManager.cpp index 5b7a4021..46a6175e 100644 --- a/src/libGLESv2/renderer/VertexDataManager.cpp +++ b/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> diff --git a/src/libGLESv2/renderer/VertexDataManager.h b/src/libGLESv2/renderer/VertexDataManager.h index 1c548385..1395f2b4 100644 --- a/src/libGLESv2/renderer/VertexDataManager.h +++ b/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 { |