Move loadimage to the d3d folder.

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

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
 {

src/libANGLE/renderer/loadimage.cpp → src/libANGLE/renderer/d3d/loadimage.cpp

 //
-// 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
 {

src/libANGLE/renderer/loadimage.h → src/libANGLE/renderer/d3d/loadimage.h

 //
-// 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 @@ inline const T *OffsetDataPointer(const uint8_t *data, size_t y, size_t z, size_
 
 #include "loadimage.inl"
 
-#endif // LIBANGLE_RENDERER_LOADIMAGE_H_
+#endif // LIBANGLE_RENDERER_D3D_LOADIMAGE_H_

src/libANGLE/renderer/loadimage.inl → src/libANGLE/renderer/d3d/loadimage.inl

 //
-// 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.
 //

src/libANGLE/renderer/loadimageSSE2.cpp → src/libANGLE/renderer/d3d/loadimageSSE2.cpp

 //
-// 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"
 

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',