commit b4dedf3e80e8e89577ef8ea45625d88536f4bf6f
author Geoff Lang <geofflang@chromium.org> Mon Jan 05 14:08:53 2015 -0500
committer Geoff Lang <geofflang@chromium.org> Fri Jan 16 21:03:29 2015 +0000
tree 92c07e291a5c438b973c68218cb1a59461a962ea
parent 909b90ce8071dd1e7bab4fcc724aa6294e791454

Merge the Image class into ImageD3D.

BUG=angle:681

Change-Id: I0c0d41fb3ff9592b08ede58a8c2ec2bd2d94a0b2
Reviewed-on: https://chromium-review.googlesource.com/238470
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/Texture.cpp

diff --git a/src/libANGLE/Texture.cpp b/src/libANGLE/Texture.cpp
index a59cf68..359e1ef 100644
--- a/src/libANGLE/Texture.cpp
+++ b/src/libANGLE/Texture.cpp
@@ -7,12 +7,8 @@
 // Texture.cpp: Implements the gl::Texture class. [OpenGL ES 2.0.24] section 3.7 page 63.
 
 #include "libANGLE/Texture.h"
-#include "libANGLE/Context.h"
+#include "libANGLE/Data.h"
 #include "libANGLE/formatutils.h"
-#include "libANGLE/ImageIndex.h"
-#include "libANGLE/Renderbuffer.h"
-#include "libANGLE/renderer/Image.h"
-#include "libANGLE/renderer/d3d/TextureStorage.h"
 
 #include "libANGLE/Surface.h"