Move GenerateMip to the D3D folder.

src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp

@@ -10,7 +10,7 @@
 #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
 #include "libANGLE/renderer/d3d/d3d11/copyvertex.h"
 #include "libANGLE/renderer/d3d/copyimage.h"
-#include "libANGLE/renderer/generatemip.h"
+#include "libANGLE/renderer/d3d/generatemip.h"
 #include "libANGLE/renderer/loadimage.h"
 #include "libANGLE/renderer/Renderer.h"
 

src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp

@@ -11,7 +11,7 @@
 #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/d3d/generatemip.h"
 #include "libANGLE/renderer/loadimage.h"
 
 namespace rx

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

 //
-// 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.
 //
@@ -7,8 +7,8 @@
 // generatemip.h: Defines the GenerateMip function, templated on the format
 // type of the image for which mip levels are being generated.
 
-#ifndef LIBANGLE_RENDERER_GENERATEMIP_H_
-#define LIBANGLE_RENDERER_GENERATEMIP_H_
+#ifndef LIBANGLE_RENDERER_D3D_GENERATEMIP_H_
+#define LIBANGLE_RENDERER_D3D_GENERATEMIP_H_
 
 #include "libANGLE/renderer/imageformats.h"
 #include "libANGLE/angletypes.h"
@@ -25,4 +25,4 @@ inline void GenerateMip(size_t sourceWidth, size_t sourceHeight, size_t sourceDe
 
 #include "generatemip.inl"
 
-#endif // LIBANGLE_RENDERER_GENERATEMIP_H_
+#endif // LIBANGLE_RENDERER_D3D_GENERATEMIP_H_

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

 //
-// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 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/libGLESv2.gypi

@@ -129,8 +129,6 @@
             'libANGLE/renderer/TransformFeedbackImpl.h',
             'libANGLE/renderer/VertexArrayImpl.h',
             'libANGLE/renderer/Workarounds.h',
-            'libANGLE/renderer/generatemip.h',
-            'libANGLE/renderer/generatemip.inl',
             'libANGLE/renderer/imageformats.h',
             'libANGLE/renderer/loadimage.cpp',
             'libANGLE/renderer/loadimage.h',
@@ -160,6 +158,8 @@
             'libANGLE/renderer/d3d/DynamicHLSL.h',
             'libANGLE/renderer/d3d/FramebufferD3D.cpp',
             'libANGLE/renderer/d3d/FramebufferD3D.h',
+            'libANGLE/renderer/d3d/generatemip.h',
+            'libANGLE/renderer/d3d/generatemip.inl',
             'libANGLE/renderer/d3d/HLSLCompiler.cpp',
             'libANGLE/renderer/d3d/HLSLCompiler.h',
             'libANGLE/renderer/d3d/ImageD3D.cpp',