Move loadimage to the d3d folder.
BUG=angle:681
Change-Id: Id901d9ae66207ac5e7d2844b8cd1f6a58c4492f6
Reviewed-on: https://chromium-review.googlesource.com/238478
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
diff --git a/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp b/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
index 94d2817..f5a1e59 100644
--- a/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
@@ -11,7 +11,7 @@
#include "libANGLE/renderer/d3d/d3d11/copyvertex.h"
#include "libANGLE/renderer/d3d/copyimage.h"
#include "libANGLE/renderer/d3d/generatemip.h"
-#include "libANGLE/renderer/loadimage.h"
+#include "libANGLE/renderer/d3d/loadimage.h"
#include "libANGLE/renderer/Renderer.h"
namespace rx
diff --git a/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp b/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
index 44db763..6cf3c97 100644
--- a/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
+++ b/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
@@ -12,7 +12,7 @@
#include "libANGLE/renderer/d3d/d3d9/vertexconversion.h"
#include "libANGLE/renderer/d3d/copyimage.h"
#include "libANGLE/renderer/d3d/generatemip.h"
-#include "libANGLE/renderer/loadimage.h"
+#include "libANGLE/renderer/d3d/loadimage.h"
namespace rx
{
diff --git a/src/libANGLE/renderer/loadimage.cpp b/src/libANGLE/renderer/d3d/loadimage.cpp
similarity index 99%
rename from src/libANGLE/renderer/loadimage.cpp
rename to src/libANGLE/renderer/d3d/loadimage.cpp
index 41509a2..172832b 100644
--- a/src/libANGLE/renderer/loadimage.cpp
+++ b/src/libANGLE/renderer/d3d/loadimage.cpp
@@ -1,12 +1,12 @@
//
-// Copyright (c) 2013-2014 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2013-2015 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// loadimage.cpp: Defines image loading functions.
-#include "libANGLE/renderer/loadimage.h"
+#include "libANGLE/renderer/d3d/loadimage.h"
namespace rx
{
diff --git a/src/libANGLE/renderer/loadimage.h b/src/libANGLE/renderer/d3d/loadimage.h
similarity index 97%
rename from src/libANGLE/renderer/loadimage.h
rename to src/libANGLE/renderer/d3d/loadimage.h
index 664a24b..6967dc8 100644
--- a/src/libANGLE/renderer/loadimage.h
+++ b/src/libANGLE/renderer/d3d/loadimage.h
@@ -1,13 +1,13 @@
//
-// Copyright (c) 2013-2014 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2013-2015 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// loadimage.h: Defines image loading functions
-#ifndef LIBANGLE_RENDERER_LOADIMAGE_H_
-#define LIBANGLE_RENDERER_LOADIMAGE_H_
+#ifndef LIBANGLE_RENDERER_D3D_LOADIMAGE_H_
+#define LIBANGLE_RENDERER_D3D_LOADIMAGE_H_
#include "libANGLE/angletypes.h"
@@ -190,4 +190,4 @@
#include "loadimage.inl"
-#endif // LIBANGLE_RENDERER_LOADIMAGE_H_
+#endif // LIBANGLE_RENDERER_D3D_LOADIMAGE_H_
diff --git a/src/libANGLE/renderer/loadimage.inl b/src/libANGLE/renderer/d3d/loadimage.inl
similarity index 98%
rename from src/libANGLE/renderer/loadimage.inl
rename to src/libANGLE/renderer/d3d/loadimage.inl
index abd0a36..920e667 100644
--- a/src/libANGLE/renderer/loadimage.inl
+++ b/src/libANGLE/renderer/d3d/loadimage.inl
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2014-2015 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
diff --git a/src/libANGLE/renderer/loadimageSSE2.cpp b/src/libANGLE/renderer/d3d/loadimageSSE2.cpp
similarity index 97%
rename from src/libANGLE/renderer/loadimageSSE2.cpp
rename to src/libANGLE/renderer/d3d/loadimageSSE2.cpp
index 643d4e1..c87d35c 100644
--- a/src/libANGLE/renderer/loadimageSSE2.cpp
+++ b/src/libANGLE/renderer/d3d/loadimageSSE2.cpp
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2002-2015 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
@@ -8,7 +8,7 @@
// in a separated file for GCC, which can enable SSE usage only per-file,
// not for code blocks that use SSE2 explicitly.
-#include "libANGLE/renderer/loadimage.h"
+#include "libANGLE/renderer/d3d/loadimage.h"
#include "common/platform.h"
diff --git a/src/libGLESv2.gypi b/src/libGLESv2.gypi
index d7bc77d..e5a3c16 100644
--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -130,10 +130,6 @@
'libANGLE/renderer/VertexArrayImpl.h',
'libANGLE/renderer/Workarounds.h',
'libANGLE/renderer/imageformats.h',
- 'libANGLE/renderer/loadimage.cpp',
- 'libANGLE/renderer/loadimage.h',
- 'libANGLE/renderer/loadimage.inl',
- 'libANGLE/renderer/loadimageSSE2.cpp',
'libANGLE/validationES.cpp',
'libANGLE/validationES.h',
'libANGLE/validationES2.cpp',
@@ -168,6 +164,10 @@
'libANGLE/renderer/d3d/IndexBuffer.h',
'libANGLE/renderer/d3d/IndexDataManager.cpp',
'libANGLE/renderer/d3d/IndexDataManager.h',
+ 'libANGLE/renderer/d3d/loadimage.cpp',
+ 'libANGLE/renderer/d3d/loadimage.h',
+ 'libANGLE/renderer/d3d/loadimage.inl',
+ 'libANGLE/renderer/d3d/loadimageSSE2.cpp',
'libANGLE/renderer/d3d/MemoryBuffer.cpp',
'libANGLE/renderer/d3d/MemoryBuffer.h',
'libANGLE/renderer/d3d/ProgramD3D.cpp',
