Move copyimage to the D3D folder.

BUG=angle:681 Change-Id: I2ce237281cc75fdae11b5ddb4eca52058c395e7a Reviewed-on: https://chromium-review.googlesource.com/238475Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Brandon Jones <bajones@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Move copyimage to the D3D folder.
59c4debe · Geoff Lang · 6f5dc074 · 59c4debe · 59c4debe · 59c4debe
Commit 59c4debe authored Jan 05, 2015 by Geoff Lang
7 changed files
--- a/src/libANGLE/formatutils.cpp
+++ b/src/libANGLE/formatutils.cpp
@@ -12,7 +12,7 @@
 #include "libANGLE/Framebuffer.h"
 #include "libANGLE/renderer/Renderer.h"
 #include "libANGLE/renderer/imageformats.h"
-#include "libANGLE/renderer/copyimage.h"
+#include "libANGLE/renderer/d3d/copyimage.h"
 namespace gl
 {

--- a/src/libANGLE/renderer/copyimage.cpp
+++ b/src/libANGLE/renderer/copyimage.cpp
@@ -6,7 +6,7 @@
 // copyimage.cpp: Defines image copying functions
-#include "libANGLE/renderer/copyimage.h"
+#include "libANGLE/renderer/d3d/copyimage.h"
 namespace rx
 {

--- a/src/libANGLE/renderer/copyimage.h
+++ b/src/libANGLE/renderer/copyimage.h
@@ -6,8 +6,8 @@
 // copyimage.h: Defines image copying functions
-#ifndef LIBANGLE_RENDERER_COPYIMAGE_H_
+#ifndef LIBANGLE_RENDERER_D3D_COPYIMAGE_H_
-#define LIBANGLE_RENDERER_COPYIMAGE_H_
+#define LIBANGLE_RENDERER_D3D_COPYIMAGE_H_
 #include "common/mathutil.h"
 #include "libANGLE/angletypes.h"
@@ -32,4 +32,4 @@ void CopyBGRA8ToRGBA8(const uint8_t *source, uint8_t *dest);
 #include "copyimage.inl"
-#endif // LIBANGLE_RENDERER_COPYIMAGE_H_
+#endif // LIBANGLE_RENDERER_D3D_COPYIMAGE_H_
--- a/src/libANGLE/renderer/copyimage.inl
+++ b/src/libANGLE/renderer/copyimage.inl
--- a/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
@@ -8,9 +8,9 @@
 // formats.
 #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
+#include "libANGLE/renderer/d3d/copyimage.h"
 #include "libANGLE/renderer/generatemip.h"
 #include "libANGLE/renderer/loadimage.h"
-#include "libANGLE/renderer/copyimage.h"
 #include "libANGLE/renderer/Renderer.h"
 #include "libANGLE/renderer/copyvertex.h"

--- a/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
+++ b/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
@@ -10,9 +10,9 @@
 #include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
 #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
 #include "libANGLE/renderer/d3d/d3d9/vertexconversion.h"
+#include "libANGLE/renderer/d3d/copyimage.h"
 #include "libANGLE/renderer/generatemip.h"
 #include "libANGLE/renderer/loadimage.h"
-#include "libANGLE/renderer/copyimage.h"
 namespace rx
 {

--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -129,9 +129,6 @@
            'libANGLE/renderer/TransformFeedbackImpl.h',
            'libANGLE/renderer/VertexArrayImpl.h',
            'libANGLE/renderer/Workarounds.h',
-            'libANGLE/renderer/copyimage.cpp',
-            'libANGLE/renderer/copyimage.h',
-            'libANGLE/renderer/copyimage.inl',
            'libANGLE/renderer/copyvertex.h',
            'libANGLE/renderer/copyvertex.inl',
            'libANGLE/renderer/generatemip.h',
@@ -156,6 +153,9 @@
            'libANGLE/renderer/d3d/BufferD3D.h',
            'libANGLE/renderer/d3d/CompilerD3D.cpp',
            'libANGLE/renderer/d3d/CompilerD3D.h',
+            'libANGLE/renderer/d3d/copyimage.cpp',
+            'libANGLE/renderer/d3d/copyimage.h',
+            'libANGLE/renderer/d3d/copyimage.inl',
            'libANGLE/renderer/d3d/DisplayD3D.cpp',
            'libANGLE/renderer/d3d/DisplayD3D.h',
            'libANGLE/renderer/d3d/DynamicHLSL.cpp',