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
diff --git a/src/build_angle.gyp b/src/build_angle.gyp
index 3f26c93..6d9b206 100644
--- a/src/build_angle.gyp
+++ b/src/build_angle.gyp
@@ -145,11 +145,11 @@
'common/debug.cpp',
'common/debug.h',
'common/version.h',
- 'libGLESv2/geometry/IndexDataManager.cpp',
- 'libGLESv2/geometry/IndexDataManager.h',
- 'libGLESv2/geometry/vertexconversion.h',
- 'libGLESv2/geometry/VertexDataManager.cpp',
- 'libGLESv2/geometry/VertexDataManager.h',
+ 'libGLESv2/IndexDataManager.cpp',
+ 'libGLESv2/IndexDataManager.h',
+ 'libGLESv2/vertexconversion.h',
+ 'libGLESv2/VertexDataManager.cpp',
+ 'libGLESv2/VertexDataManager.h',
'libGLESv2/Blit.cpp',
'libGLESv2/Blit.h',
'libGLESv2/Buffer.cpp',
diff --git a/src/common/version.h b/src/common/version.h
index a2bf63f..bd7ba31 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,7 +1,7 @@
#define MAJOR_VERSION 0
#define MINOR_VERSION 0
#define BUILD_VERSION 0
-#define BUILD_REVISION 563
+#define BUILD_REVISION 564
#define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x)
diff --git a/src/libGLESv2/Buffer.cpp b/src/libGLESv2/Buffer.cpp
index 17cea6c..1873f28 100644
--- a/src/libGLESv2/Buffer.cpp
+++ b/src/libGLESv2/Buffer.cpp
@@ -11,8 +11,8 @@
#include "libGLESv2/Buffer.h"
#include "libGLESv2/main.h"
-#include "libGLESv2/geometry/VertexDataManager.h"
-#include "libGLESv2/geometry/IndexDataManager.h"
+#include "libGLESv2/VertexDataManager.h"
+#include "libGLESv2/IndexDataManager.h"
namespace gl
{
diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index dec30b8..0defe4a 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -25,8 +25,8 @@
#include "libGLESv2/RenderBuffer.h"
#include "libGLESv2/Shader.h"
#include "libGLESv2/Texture.h"
-#include "libGLESv2/geometry/VertexDataManager.h"
-#include "libGLESv2/geometry/IndexDataManager.h"
+#include "libGLESv2/VertexDataManager.h"
+#include "libGLESv2/IndexDataManager.h"
#undef near
#undef far
diff --git a/src/libGLESv2/geometry/IndexDataManager.cpp b/src/libGLESv2/IndexDataManager.cpp
similarity index 98%
rename from src/libGLESv2/geometry/IndexDataManager.cpp
rename to src/libGLESv2/IndexDataManager.cpp
index f79d606..afaf1b1 100644
--- a/src/libGLESv2/geometry/IndexDataManager.cpp
+++ b/src/libGLESv2/IndexDataManager.cpp
@@ -4,10 +4,10 @@
// 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.
-#include "libGLESv2/geometry/IndexDataManager.h"
+#include "libGLESv2/IndexDataManager.h"
#include "common/debug.h"
diff --git a/src/libGLESv2/geometry/IndexDataManager.h b/src/libGLESv2/IndexDataManager.h
similarity index 92%
rename from src/libGLESv2/geometry/IndexDataManager.h
rename to src/libGLESv2/IndexDataManager.h
index d48249c..0889510 100644
--- a/src/libGLESv2/geometry/IndexDataManager.h
+++ b/src/libGLESv2/IndexDataManager.h
@@ -4,11 +4,11 @@
// 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.
-#ifndef LIBGLESV2_GEOMETRY_INDEXDATAMANAGER_H_
-#define LIBGLESV2_GEOMETRY_INDEXDATAMANAGER_H_
+#ifndef LIBGLESV2_INDEXDATAMANAGER_H_
+#define LIBGLESV2_INDEXDATAMANAGER_H_
#include <vector>
#include <cstddef>
@@ -117,4 +117,4 @@
}
-#endif // LIBGLESV2_GEOMETRY_INDEXDATAMANAGER_H_
+#endif // LIBGLESV2_INDEXDATAMANAGER_H_
diff --git a/src/libGLESv2/geometry/VertexDataManager.cpp b/src/libGLESv2/VertexDataManager.cpp
similarity index 98%
rename from src/libGLESv2/geometry/VertexDataManager.cpp
rename to src/libGLESv2/VertexDataManager.cpp
index 99ece17..6eebf57 100644
--- a/src/libGLESv2/geometry/VertexDataManager.cpp
+++ b/src/libGLESv2/VertexDataManager.cpp
@@ -4,10 +4,10 @@
// 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.
-#include "libGLESv2/geometry/VertexDataManager.h"
+#include "libGLESv2/VertexDataManager.h"
#include "common/debug.h"
@@ -15,8 +15,8 @@
#include "libGLESv2/Program.h"
#include "libGLESv2/main.h"
-#include "libGLESv2/geometry/vertexconversion.h"
-#include "libGLESv2/geometry/IndexDataManager.h"
+#include "libGLESv2/vertexconversion.h"
+#include "libGLESv2/IndexDataManager.h"
namespace
{
diff --git a/src/libGLESv2/geometry/VertexDataManager.h b/src/libGLESv2/VertexDataManager.h
similarity index 94%
rename from src/libGLESv2/geometry/VertexDataManager.h
rename to src/libGLESv2/VertexDataManager.h
index 257f2c3..27d55d8 100644
--- a/src/libGLESv2/geometry/VertexDataManager.h
+++ b/src/libGLESv2/VertexDataManager.h
@@ -4,11 +4,11 @@
// 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.
-#ifndef LIBGLESV2_GEOMETRY_VERTEXDATAMANAGER_H_
-#define LIBGLESV2_GEOMETRY_VERTEXDATAMANAGER_H_
+#ifndef LIBGLESV2_VERTEXDATAMANAGER_H_
+#define LIBGLESV2_VERTEXDATAMANAGER_H_
#include <vector>
#include <cstddef>
@@ -167,4 +167,4 @@
}
-#endif // LIBGLESV2_GEOMETRY_VERTEXDATAMANAGER_H_
+#endif // LIBGLESV2_VERTEXDATAMANAGER_H_
diff --git a/src/libGLESv2/libGLESv2.vcproj b/src/libGLESv2/libGLESv2.vcproj
index 1ccf07b..73e3a15 100644
--- a/src/libGLESv2/libGLESv2.vcproj
+++ b/src/libGLESv2/libGLESv2.vcproj
@@ -209,6 +209,10 @@
>
</File>
<File
+ RelativePath=".\IndexDataManager.cpp"
+ >
+ </File>
+ <File
RelativePath=".\libGLESv2.cpp"
>
</File>
@@ -244,18 +248,10 @@
RelativePath=".\utilities.cpp"
>
</File>
- <Filter
- Name="Geometry"
+ <File
+ RelativePath=".\VertexDataManager.cpp"
>
- <File
- RelativePath=".\geometry\IndexDataManager.cpp"
- >
- </File>
- <File
- RelativePath=".\geometry\VertexDataManager.cpp"
- >
- </File>
- </Filter>
+ </File>
</Filter>
<Filter
Name="Header Files"
@@ -295,6 +291,10 @@
>
</File>
<File
+ RelativePath=".\IndexDataManager.h"
+ >
+ </File>
+ <File
RelativePath=".\main.h"
>
</File>
@@ -338,22 +338,14 @@
RelativePath="..\common\version.h"
>
</File>
- <Filter
- Name="Geometry"
+ <File
+ RelativePath=".\vertexconversion.h"
>
- <File
- RelativePath=".\geometry\IndexDataManager.h"
- >
- </File>
- <File
- RelativePath=".\geometry\vertexconversion.h"
- >
- </File>
- <File
- RelativePath=".\geometry\VertexDataManager.h"
- >
- </File>
- </Filter>
+ </File>
+ <File
+ RelativePath=".\VertexDataManager.h"
+ >
+ </File>
</Filter>
<File
RelativePath=".\libGLESv2.def"
diff --git a/src/libGLESv2/geometry/vertexconversion.h b/src/libGLESv2/vertexconversion.h
similarity index 95%
rename from src/libGLESv2/geometry/vertexconversion.h
rename to src/libGLESv2/vertexconversion.h
index e55dc72..5bb8b89 100644
--- a/src/libGLESv2/geometry/vertexconversion.h
+++ b/src/libGLESv2/vertexconversion.h
@@ -4,11 +4,11 @@
// 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.
-#ifndef LIBGLESV2_GEOMETRY_VERTEXCONVERSION_H_
-#define LIBGLESV2_GEOMETRY_VERTEXCONVERSION_H_
+#ifndef LIBGLESV2_VERTEXCONVERSION_H_
+#define LIBGLESV2_VERTEXCONVERSION_H_
#include <cstddef>
#include <limits>
@@ -205,4 +205,4 @@
}
-#endif // LIBGLESV2_GEOMETRY_VERTEXCONVERSION_H_
+#endif // LIBGLESV2_VERTEXCONVERSION_H_
