Skip to content

A
angle
Commit 8fd34bd6 by daniel@transgaming.com
Options

Move geometry files.

TRAC #15649 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@564 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent e90a0d5a
Showing with 47 additions and 55 deletions
src/build_angle.gyp
...@@ -145,11 +145,11 @@ ...@@ -145,11 +145,11 @@
'common/debug.cpp', 'common/debug.cpp',
'common/debug.h', 'common/debug.h',
'common/version.h', 'common/version.h',
'libGLESv2/geometry/IndexDataManager.cpp', 'libGLESv2/IndexDataManager.cpp',
'libGLESv2/geometry/IndexDataManager.h', 'libGLESv2/IndexDataManager.h',
'libGLESv2/geometry/vertexconversion.h', 'libGLESv2/vertexconversion.h',
'libGLESv2/geometry/VertexDataManager.cpp', 'libGLESv2/VertexDataManager.cpp',
'libGLESv2/geometry/VertexDataManager.h', 'libGLESv2/VertexDataManager.h',
'libGLESv2/Blit.cpp', 'libGLESv2/Blit.cpp',
'libGLESv2/Blit.h', 'libGLESv2/Blit.h',
'libGLESv2/Buffer.cpp', 'libGLESv2/Buffer.cpp',
......
src/common/version.h
#define MAJOR_VERSION 0 #define MAJOR_VERSION 0
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 563 #define BUILD_REVISION 564
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
src/libGLESv2/Buffer.cpp
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include "libGLESv2/Buffer.h" #include "libGLESv2/Buffer.h"
#include "libGLESv2/main.h" #include "libGLESv2/main.h"
#include "libGLESv2/geometry/VertexDataManager.h" #include "libGLESv2/VertexDataManager.h"
#include "libGLESv2/geometry/IndexDataManager.h" #include "libGLESv2/IndexDataManager.h"
namespace gl namespace gl
{ {
......
src/libGLESv2/Context.cpp
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#include "libGLESv2/RenderBuffer.h" #include "libGLESv2/RenderBuffer.h"
#include "libGLESv2/Shader.h" #include "libGLESv2/Shader.h"
#include "libGLESv2/Texture.h" #include "libGLESv2/Texture.h"
#include "libGLESv2/geometry/VertexDataManager.h" #include "libGLESv2/VertexDataManager.h"
#include "libGLESv2/geometry/IndexDataManager.h" #include "libGLESv2/IndexDataManager.h"
#undef near #undef near
#undef far #undef far
......
src/libGLESv2/geometry/IndexDataManager.cpp → src/libGLESv2/IndexDataManager.cpp
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// geometry/IndexDataManager.cpp: Defines the IndexDataManager, a class that // IndexDataManager.cpp: Defines the IndexDataManager, a class that
// runs the Buffer translation process for index buffers. // runs the Buffer translation process for index buffers.
#include "libGLESv2/geometry/IndexDataManager.h" #include "libGLESv2/IndexDataManager.h"
#include "common/debug.h" #include "common/debug.h"
......
src/libGLESv2/geometry/IndexDataManager.h → src/libGLESv2/IndexDataManager.h
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// geometry/IndexDataManager.h: Defines the IndexDataManager, a class that // IndexDataManager.h: Defines the IndexDataManager, a class that
// runs the Buffer translation process for index buffers. // runs the Buffer translation process for index buffers.
#ifndef LIBGLESV2_GEOMETRY_INDEXDATAMANAGER_H_ #ifndef LIBGLESV2_INDEXDATAMANAGER_H_
#define LIBGLESV2_GEOMETRY_INDEXDATAMANAGER_H_ #define LIBGLESV2_INDEXDATAMANAGER_H_
#include <vector> #include <vector>
#include <cstddef> #include <cstddef>
...@@ -117,4 +117,4 @@ class IndexDataManager ...@@ -117,4 +117,4 @@ class IndexDataManager
} }
#endif // LIBGLESV2_GEOMETRY_INDEXDATAMANAGER_H_ #endif // LIBGLESV2_INDEXDATAMANAGER_H_
src/libGLESv2/geometry/VertexDataManager.cpp → src/libGLESv2/VertexDataManager.cpp
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// geometry/VertexDataManager.h: Defines the VertexDataManager, a class that // VertexDataManager.h: Defines the VertexDataManager, a class that
// runs the Buffer translation process. // runs the Buffer translation process.
#include "libGLESv2/geometry/VertexDataManager.h" #include "libGLESv2/VertexDataManager.h"
#include "common/debug.h" #include "common/debug.h"
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
#include "libGLESv2/Program.h" #include "libGLESv2/Program.h"
#include "libGLESv2/main.h" #include "libGLESv2/main.h"
#include "libGLESv2/geometry/vertexconversion.h" #include "libGLESv2/vertexconversion.h"
#include "libGLESv2/geometry/IndexDataManager.h" #include "libGLESv2/IndexDataManager.h"
namespace namespace
{ {
......
src/libGLESv2/geometry/VertexDataManager.h → src/libGLESv2/VertexDataManager.h
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// geometry/VertexDataManager.h: Defines the VertexDataManager, a class that // VertexDataManager.h: Defines the VertexDataManager, a class that
// runs the Buffer translation process. // runs the Buffer translation process.
#ifndef LIBGLESV2_GEOMETRY_VERTEXDATAMANAGER_H_ #ifndef LIBGLESV2_VERTEXDATAMANAGER_H_
#define LIBGLESV2_GEOMETRY_VERTEXDATAMANAGER_H_ #define LIBGLESV2_VERTEXDATAMANAGER_H_
#include <vector> #include <vector>
#include <cstddef> #include <cstddef>
...@@ -167,4 +167,4 @@ class VertexDataManager ...@@ -167,4 +167,4 @@ class VertexDataManager
} }
#endif // LIBGLESV2_GEOMETRY_VERTEXDATAMANAGER_H_ #endif // LIBGLESV2_VERTEXDATAMANAGER_H_
src/libGLESv2/libGLESv2.vcproj
...@@ -209,6 +209,10 @@ ...@@ -209,6 +209,10 @@
> >
</File> </File>
<File <File
RelativePath=".\IndexDataManager.cpp"
>
</File>
<File
RelativePath=".\libGLESv2.cpp" RelativePath=".\libGLESv2.cpp"
> >
</File> </File>
...@@ -244,18 +248,10 @@ ...@@ -244,18 +248,10 @@
RelativePath=".\utilities.cpp" RelativePath=".\utilities.cpp"
> >
</File> </File>
<Filter <File
Name="Geometry" RelativePath=".\VertexDataManager.cpp"
> >
<File </File>
RelativePath=".\geometry\IndexDataManager.cpp"
>
</File>
<File
RelativePath=".\geometry\VertexDataManager.cpp"
>
</File>
</Filter>
</Filter> </Filter>
<Filter <Filter
Name="Header Files" Name="Header Files"
...@@ -295,6 +291,10 @@ ...@@ -295,6 +291,10 @@
> >
</File> </File>
<File <File
RelativePath=".\IndexDataManager.h"
>
</File>
<File
RelativePath=".\main.h" RelativePath=".\main.h"
> >
</File> </File>
...@@ -338,22 +338,14 @@ ...@@ -338,22 +338,14 @@
RelativePath="..\common\version.h" RelativePath="..\common\version.h"
> >
</File> </File>
<Filter <File
Name="Geometry" RelativePath=".\vertexconversion.h"
> >
<File </File>
RelativePath=".\geometry\IndexDataManager.h" <File
> RelativePath=".\VertexDataManager.h"
</File> >
<File </File>
RelativePath=".\geometry\vertexconversion.h"
>
</File>
<File
RelativePath=".\geometry\VertexDataManager.h"
>
</File>
</Filter>
</Filter> </Filter>
<File <File
RelativePath=".\libGLESv2.def" RelativePath=".\libGLESv2.def"
......
src/libGLESv2/geometry/vertexconversion.h → src/libGLESv2/vertexconversion.h
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
// found in the LICENSE file. // found in the LICENSE file.
// //
// geometry/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 LIBGLESV2_GEOMETRY_VERTEXCONVERSION_H_ #ifndef LIBGLESV2_VERTEXCONVERSION_H_
#define LIBGLESV2_GEOMETRY_VERTEXCONVERSION_H_ #define LIBGLESV2_VERTEXCONVERSION_H_
#include <cstddef> #include <cstddef>
#include <limits> #include <limits>
...@@ -205,4 +205,4 @@ struct VertexDataConverter ...@@ -205,4 +205,4 @@ struct VertexDataConverter
} }
#endif // LIBGLESV2_GEOMETRY_VERTEXCONVERSION_H_ #endif // LIBGLESV2_VERTEXCONVERSION_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