Fixed some circular includes.

TRAC #22418 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1841 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fixed some circular includes.
938ac8d7 · shannon.woods@transgaming.com · b32e1987 · 938ac8d7 · 938ac8d7 · 938ac8d7
Commit 938ac8d7 authored Feb 28, 2013 by shannon.woods@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

Context.cpp src/libGLESv2/Context.cpp +1 -0

IndexBuffer.h src/libGLESv2/renderer/IndexBuffer.h +2 -1

IndexDataManager.h src/libGLESv2/renderer/IndexDataManager.h +1 -2

No files found.
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -25,6 +25,7 @@
 #include "libGLESv2/Renderbuffer.h"
 #include "libGLESv2/Shader.h"
 #include "libGLESv2/Texture.h"
+#include "libGLESv2/renderer/IndexDataManager.h"

 #undef near
 #undef far

--- a/src/libGLESv2/renderer/IndexBuffer.h
+++ b/src/libGLESv2/renderer/IndexBuffer.h
@@ -13,7 +13,8 @@
 #define GL_APICALL
 #include <GLES2/gl2.h>

-#include "libGLESv2/Context.h"
+#include <map>
+
 #include "libGLESv2/renderer/Renderer.h"

 namespace rx

--- a/src/libGLESv2/renderer/IndexDataManager.h
+++ b/src/libGLESv2/renderer/IndexDataManager.h
@@ -16,7 +16,7 @@
 #define GL_APICALL
 #include <GLES2/gl2.h>

-#include "libGLESv2/Context.h"
+#include "libGLESv2/renderer/Renderer.h"
 #include "libGLESv2/renderer/IndexBuffer.h"

 namespace
@@ -26,7 +26,6 @@ namespace

 namespace rx
 {
-class Renderer9;

 struct TranslatedIndexData
 {