commit 772d5791a5d9ef5708536af6437d532979b323db
author Nicolas Capens <capn@google.com> Thu Oct 23 16:03:51 2014 -0400
committer Nicolas Capens <nicolascapens@google.com> Fri Oct 24 03:12:06 2014 +0000
tree 0f75abfad2743141e1656274f6690a5874ad992d
parent e8139407b9d233e409879b6b22e0dc4a0b3bb01d

Don't include libGLESv2 headers in libEGL headers.

BUG=18110152

Change-Id: Idf21c48b1fa154382e1056b8340d5ab777358755
Reviewed-on: https://swiftshader-review.googlesource.com/1234
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

src/GLES2/libEGL/Display.cpp

diff --git a/src/GLES2/libEGL/Display.cpp b/src/GLES2/libEGL/Display.cpp
index 9ea6b40..e83b05c 100644
--- a/src/GLES2/libEGL/Display.cpp
+++ b/src/GLES2/libEGL/Display.cpp
@@ -17,6 +17,7 @@
 

 #include "main.h"

 #include "libGLESv2/mathutil.h"

+#include "libGLESv2/Context.h"

 #include "libGLESv2/Device.hpp"

 #include "common/debug.h"

 

src/GLES2/libEGL/Display.h

diff --git a/src/GLES2/libEGL/Display.h b/src/GLES2/libEGL/Display.h
index b77e857..651cc93 100644
--- a/src/GLES2/libEGL/Display.h
+++ b/src/GLES2/libEGL/Display.h
@@ -18,11 +18,15 @@
 

 #include "Config.h"

 #include "Surface.h"

-#include "libGLESv2/Context.h"

-#include "libGLESv2/Device.hpp"

 

 #include <set>

 

+namespace gl

+{

+class Context;

+class Device;

+}

+

 namespace egl

 {

 	class Display

src/GLES2/libEGL/Surface.h

diff --git a/src/GLES2/libEGL/Surface.h b/src/GLES2/libEGL/Surface.h
index 7d8f5e4..695937d 100644
--- a/src/GLES2/libEGL/Surface.h
+++ b/src/GLES2/libEGL/Surface.h
@@ -16,8 +16,6 @@
 #ifndef INCLUDE_SURFACE_H_

 #define INCLUDE_SURFACE_H_

 

-#include "libGLESv2/Image.hpp"

-#include "libGLESv2/Texture.h"

 #include "Main/FrameBuffer.hpp"

 

 #define EGLAPI