Move vertexconversion.h to the d3d9 folder.

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

Move vertexconversion.h to the d3d9 folder.
6f5dc074 · Geoff Lang · 359ef269 · 6f5dc074 · 6f5dc074 · 6f5dc074
Commit 6f5dc074 authored Jan 05, 2015 by Geoff Lang
4 changed files
--- a/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
+++ b/src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
@@ -9,7 +9,7 @@
 #include "libANGLE/renderer/d3d/d3d9/VertexBuffer9.h"
 #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
 #include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
-#include "libANGLE/renderer/vertexconversion.h"
+#include "libANGLE/renderer/d3d/d3d9/vertexconversion.h"
 #include "libANGLE/renderer/d3d/BufferD3D.h"
 #include "libANGLE/VertexAttribute.h"
 #include "libANGLE/Buffer.h"

--- a/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
+++ b/src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
@@ -9,10 +9,10 @@

 #include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
 #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
+#include "libANGLE/renderer/d3d/d3d9/vertexconversion.h"
 #include "libANGLE/renderer/generatemip.h"
 #include "libANGLE/renderer/loadimage.h"
 #include "libANGLE/renderer/copyimage.h"
-#include "libANGLE/renderer/vertexconversion.h"

 namespace rx
 {

--- a/src/libANGLE/renderer/vertexconversion.h
+++ b/src/libANGLE/renderer/vertexconversion.h
@@ -7,8 +7,8 @@
 // vertexconversion.h: A library of vertex conversion classes that can be used to build
 // the FormatConverter objects used by the buffer conversion system.

-#ifndef LIBANGLE_VERTEXCONVERSION_H_
-#define LIBANGLE_VERTEXCONVERSION_H_
+#ifndef LIBANGLE_RENDERER_D3D_D3D9_VERTEXCONVERSION_H_
+#define LIBANGLE_RENDERER_D3D_D3D9_VERTEXCONVERSION_H_

 #include <limits>
 #include <cstdint>
@@ -194,4 +194,4 @@ struct VertexDataConverter

 }

-#endif   // LIBANGLE_VERTEXCONVERSION_H_
+#endif   // LIBANGLE_RENDERER_D3D_D3D9_VERTEXCONVERSION_H_
--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -141,7 +141,6 @@
            'libANGLE/renderer/loadimage.h',
            'libANGLE/renderer/loadimage.inl',
            'libANGLE/renderer/loadimageSSE2.cpp',
-            'libANGLE/renderer/vertexconversion.h',
            'libANGLE/validationES.cpp',
            'libANGLE/validationES.h',
            'libANGLE/validationES2.cpp',
@@ -238,6 +237,7 @@
            'libANGLE/renderer/d3d/d3d9/VertexArray9.h',
            'libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp',
            'libANGLE/renderer/d3d/d3d9/VertexBuffer9.h',
+            'libANGLE/renderer/d3d/d3d9/vertexconversion.h',
            'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp',
            'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h',
        ],