Skip to content

A
angle
Commit 6f5dc074 by Geoff Lang
Options

Move vertexconversion.h to the d3d9 folder.

BUG=angle:681 Change-Id: I87ef6856040978a9a6045d1df20fe3117def35a3 Reviewed-on: https://chromium-review.googlesource.com/238474Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarBrandon Jones <bajones@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 359ef269
Showing with 6 additions and 6 deletions
src/libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "libANGLE/renderer/d3d/d3d9/VertexBuffer9.h" #include "libANGLE/renderer/d3d/d3d9/VertexBuffer9.h"
#include "libANGLE/renderer/d3d/d3d9/Renderer9.h" #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
#include "libANGLE/renderer/d3d/d3d9/formatutils9.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/renderer/d3d/BufferD3D.h"
#include "libANGLE/VertexAttribute.h" #include "libANGLE/VertexAttribute.h"
#include "libANGLE/Buffer.h" #include "libANGLE/Buffer.h"
......
src/libANGLE/renderer/d3d/d3d9/formatutils9.cpp
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
#include "libANGLE/renderer/d3d/d3d9/formatutils9.h" #include "libANGLE/renderer/d3d/d3d9/formatutils9.h"
#include "libANGLE/renderer/d3d/d3d9/Renderer9.h" #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
#include "libANGLE/renderer/d3d/d3d9/vertexconversion.h"
#include "libANGLE/renderer/generatemip.h" #include "libANGLE/renderer/generatemip.h"
#include "libANGLE/renderer/loadimage.h" #include "libANGLE/renderer/loadimage.h"
#include "libANGLE/renderer/copyimage.h" #include "libANGLE/renderer/copyimage.h"
#include "libANGLE/renderer/vertexconversion.h"
namespace rx namespace rx
{ {
......
src/libANGLE/renderer/vertexconversion.h → src/libANGLE/renderer/d3d/d3d9/vertexconversion.h
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
// vertexconversion.h: A library of vertex conversion classes that can be used to build // vertexconversion.h: A library of vertex conversion classes that can be used to build
// the FormatConverter objects used by the buffer conversion system. // the FormatConverter objects used by the buffer conversion system.
#ifndef LIBANGLE_VERTEXCONVERSION_H_ #ifndef LIBANGLE_RENDERER_D3D_D3D9_VERTEXCONVERSION_H_
#define LIBANGLE_VERTEXCONVERSION_H_ #define LIBANGLE_RENDERER_D3D_D3D9_VERTEXCONVERSION_H_
#include <limits> #include <limits>
#include <cstdint> #include <cstdint>
...@@ -194,4 +194,4 @@ struct VertexDataConverter ...@@ -194,4 +194,4 @@ struct VertexDataConverter
} }
#endif // LIBANGLE_VERTEXCONVERSION_H_ #endif // LIBANGLE_RENDERER_D3D_D3D9_VERTEXCONVERSION_H_
src/libGLESv2.gypi
...@@ -141,7 +141,6 @@ ...@@ -141,7 +141,6 @@
'libANGLE/renderer/loadimage.h', 'libANGLE/renderer/loadimage.h',
'libANGLE/renderer/loadimage.inl', 'libANGLE/renderer/loadimage.inl',
'libANGLE/renderer/loadimageSSE2.cpp', 'libANGLE/renderer/loadimageSSE2.cpp',
'libANGLE/renderer/vertexconversion.h',
'libANGLE/validationES.cpp', 'libANGLE/validationES.cpp',
'libANGLE/validationES.h', 'libANGLE/validationES.h',
'libANGLE/validationES2.cpp', 'libANGLE/validationES2.cpp',
...@@ -238,6 +237,7 @@ ...@@ -238,6 +237,7 @@
'libANGLE/renderer/d3d/d3d9/VertexArray9.h', 'libANGLE/renderer/d3d/d3d9/VertexArray9.h',
'libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp', 'libANGLE/renderer/d3d/d3d9/VertexBuffer9.cpp',
'libANGLE/renderer/d3d/d3d9/VertexBuffer9.h', 'libANGLE/renderer/d3d/d3d9/VertexBuffer9.h',
'libANGLE/renderer/d3d/d3d9/vertexconversion.h',
'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp', 'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp',
'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h', 'libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.h',
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment