Moved platform specific out of platform directories. This is the Chrome convention.

Review URL: http://codereview.chromium.org/372077

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31570 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 35 insertions, 35 deletions

diff --git a/o3d/core/cross/command_buffer/buffer_cb.cc b/o3d/core/cross/command_buffer/buffer_cb.cc
index 2d8d890..d2ee8dc 100644
--- a/o3d/core/cross/command_buffer/buffer_cb.cc
+++ b/o3d/core/cross/command_buffer/buffer_cb.cc
@@ -34,8 +34,8 @@
 
 #include "core/cross/precompile.h"
 #include "core/cross/command_buffer/buffer_cb.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
-#include "command_buffer/client/cross/fenced_allocator.h"
+#include "command_buffer/client/o3d_cmd_helper.h"
+#include "command_buffer/client/fenced_allocator.h"
 
 namespace o3d {
 using command_buffer::CommandBufferEntry;
diff --git a/o3d/core/cross/command_buffer/effect_cb.cc b/o3d/core/cross/command_buffer/effect_cb.cc
index a8ceb54..a3b5e66 100644
--- a/o3d/core/cross/command_buffer/effect_cb.cc
+++ b/o3d/core/cross/command_buffer/effect_cb.cc
@@ -37,10 +37,10 @@
 #include "core/cross/semantic_manager.h"
 #include "core/cross/service_locator.h"
 #include "core/cross/command_buffer/effect_cb.h"
-#include "command_buffer/common/cross/constants.h"
-#include "command_buffer/common/cross/o3d_cmd_format.h"
-#include "command_buffer/client/cross/fenced_allocator.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
+#include "command_buffer/common/constants.h"
+#include "command_buffer/common/o3d_cmd_format.h"
+#include "command_buffer/client/fenced_allocator.h"
+#include "command_buffer/client/o3d_cmd_helper.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/effect_cb.h b/o3d/core/cross/command_buffer/effect_cb.h
index 1b511fd..d193b55 100644
--- a/o3d/core/cross/command_buffer/effect_cb.h
+++ b/o3d/core/cross/command_buffer/effect_cb.h
@@ -38,7 +38,7 @@
 #include <vector>
 #include "core/cross/effect.h"
 #include "core/cross/command_buffer/renderer_cb.h"
-#include "command_buffer/client/cross/effect_helper.h"
+#include "command_buffer/client/effect_helper.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/param_cache_cb.cc b/o3d/core/cross/command_buffer/param_cache_cb.cc
index 05d7924..b850ffb 100644
--- a/o3d/core/cross/command_buffer/param_cache_cb.cc
+++ b/o3d/core/cross/command_buffer/param_cache_cb.cc
@@ -39,8 +39,8 @@
 #include "core/cross/command_buffer/effect_cb.h"
 #include "core/cross/command_buffer/param_cache_cb.h"
 #include "core/cross/command_buffer/sampler_cb.h"
-#include "command_buffer/common/cross/o3d_cmd_format.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
+#include "command_buffer/common/o3d_cmd_format.h"
+#include "command_buffer/client/o3d_cmd_helper.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/primitive_cb.cc b/o3d/core/cross/command_buffer/primitive_cb.cc
index 86051bd..68d5bbc 100644
--- a/o3d/core/cross/command_buffer/primitive_cb.cc
+++ b/o3d/core/cross/command_buffer/primitive_cb.cc
@@ -40,8 +40,8 @@
 #include "core/cross/command_buffer/effect_cb.h"
 #include "core/cross/command_buffer/stream_bank_cb.h"
 #include "core/cross/error.h"
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
+#include "command_buffer/common/gapi_interface.h"
+#include "command_buffer/client/o3d_cmd_helper.h"
 
 // TODO: add unit tests.
 
diff --git a/o3d/core/cross/command_buffer/primitive_cb.h b/o3d/core/cross/command_buffer/primitive_cb.h
index a8a9a04..3484a1d 100644
--- a/o3d/core/cross/command_buffer/primitive_cb.h
+++ b/o3d/core/cross/command_buffer/primitive_cb.h
@@ -37,7 +37,7 @@
 
 #include "core/cross/precompile.h"
 #include "core/cross/primitive.h"
-#include "command_buffer/common/cross/resource.h"
+#include "command_buffer/common/resource.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/render_surface_cb.cc b/o3d/core/cross/command_buffer/render_surface_cb.cc
index 2b66d98..773f07c 100644
--- a/o3d/core/cross/command_buffer/render_surface_cb.cc
+++ b/o3d/core/cross/command_buffer/render_surface_cb.cc
@@ -31,7 +31,7 @@
 
 
 #include "core/cross/command_buffer/render_surface_cb.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
+#include "command_buffer/client/o3d_cmd_helper.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/render_surface_cb.h b/o3d/core/cross/command_buffer/render_surface_cb.h
index ee22e3b..81dccb8 100644
--- a/o3d/core/cross/command_buffer/render_surface_cb.h
+++ b/o3d/core/cross/command_buffer/render_surface_cb.h
@@ -38,7 +38,7 @@
 

 #include "core/cross/render_surface.h"

 #include "core/cross/command_buffer/renderer_cb.h"

-#include "command_buffer/common/cross/resource.h"

+#include "command_buffer/common/resource.h"

 

 namespace o3d {

 

diff --git a/o3d/core/cross/command_buffer/renderer_cb.cc b/o3d/core/cross/command_buffer/renderer_cb.cc
index e964672..f4bb89d 100644
--- a/o3d/core/cross/command_buffer/renderer_cb.cc
+++ b/o3d/core/cross/command_buffer/renderer_cb.cc
@@ -34,9 +34,9 @@
 
 #include "core/cross/precompile.h"
 
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
-#include "command_buffer/client/cross/fenced_allocator.h"
-#include "command_buffer/common/cross/gapi_interface.h"
+#include "command_buffer/client/o3d_cmd_helper.h"
+#include "command_buffer/client/fenced_allocator.h"
+#include "command_buffer/common/gapi_interface.h"
 #include "core/cross/command_buffer/buffer_cb.h"
 #include "core/cross/command_buffer/effect_cb.h"
 #include "core/cross/command_buffer/param_cache_cb.h"
diff --git a/o3d/core/cross/command_buffer/renderer_cb.h b/o3d/core/cross/command_buffer/renderer_cb.h
index e58a2bc..a424922 100644
--- a/o3d/core/cross/command_buffer/renderer_cb.h
+++ b/o3d/core/cross/command_buffer/renderer_cb.h
@@ -39,10 +39,10 @@
 #include "core/cross/precompile.h"
 #include <vector>
 #include "core/cross/renderer.h"
-#include "command_buffer/common/cross/constants.h"
-#include "command_buffer/common/cross/resource.h"
-#include "command_buffer/client/cross/fenced_allocator.h"
-#include "command_buffer/client/cross/id_allocator.h"
+#include "command_buffer/common/constants.h"
+#include "command_buffer/common/resource.h"
+#include "command_buffer/client/fenced_allocator.h"
+#include "command_buffer/client/id_allocator.h"
 #include "gpu_plugin/command_buffer.h"
 #include "gpu_plugin/np_utils/np_object_pointer.h"
 
diff --git a/o3d/core/cross/command_buffer/sampler_cb.cc b/o3d/core/cross/command_buffer/sampler_cb.cc
index 8ceaa7d..32bccba 100644
--- a/o3d/core/cross/command_buffer/sampler_cb.cc
+++ b/o3d/core/cross/command_buffer/sampler_cb.cc
@@ -36,8 +36,8 @@
 #include "core/cross/error.h"
 #include "core/cross/command_buffer/sampler_cb.h"
 #include "core/cross/command_buffer/renderer_cb.h"
-#include "command_buffer/common/cross/o3d_cmd_format.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
+#include "command_buffer/common/o3d_cmd_format.h"
+#include "command_buffer/client/o3d_cmd_helper.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/sampler_cb.h b/o3d/core/cross/command_buffer/sampler_cb.h
index 103c595..3543436 100644
--- a/o3d/core/cross/command_buffer/sampler_cb.h
+++ b/o3d/core/cross/command_buffer/sampler_cb.h
@@ -38,7 +38,7 @@
 
 #include "core/cross/precompile.h"
 #include "core/cross/sampler.h"
-#include "command_buffer/common/cross/resource.h"
+#include "command_buffer/common/resource.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/states_cb.cc b/o3d/core/cross/command_buffer/states_cb.cc
index c437290..6903107 100644
--- a/o3d/core/cross/command_buffer/states_cb.cc
+++ b/o3d/core/cross/command_buffer/states_cb.cc
@@ -37,7 +37,7 @@
 #include "core/cross/state.h"
 #include "core/cross/command_buffer/renderer_cb.h"
 #include "core/cross/command_buffer/states_cb.h"
-#include "command_buffer/common/cross/gapi_interface.h"
+#include "command_buffer/common/gapi_interface.h"
 
 namespace o3d {
 using command_buffer::CommandBufferEntry;
diff --git a/o3d/core/cross/command_buffer/states_cb.h b/o3d/core/cross/command_buffer/states_cb.h
index e2a1905..0b8e1cf 100644
--- a/o3d/core/cross/command_buffer/states_cb.h
+++ b/o3d/core/cross/command_buffer/states_cb.h
@@ -37,8 +37,8 @@
 #define O3D_CORE_CROSS_COMMAND_BUFFER_STATES_CB_H_
 
 #include "core/cross/command_buffer/renderer_cb.h"
-#include "command_buffer/common/cross/o3d_cmd_format.h"
-#include "command_buffer/client/cross/cmd_buffer_helper.h"
+#include "command_buffer/common/o3d_cmd_format.h"
+#include "command_buffer/client/cmd_buffer_helper.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/stream_bank_cb.cc b/o3d/core/cross/command_buffer/stream_bank_cb.cc
index 11bb06f..c10e256 100644
--- a/o3d/core/cross/command_buffer/stream_bank_cb.cc
+++ b/o3d/core/cross/command_buffer/stream_bank_cb.cc
@@ -39,8 +39,8 @@
 #include "core/cross/command_buffer/buffer_cb.h"
 #include "core/cross/command_buffer/effect_cb.h"
 #include "core/cross/command_buffer/stream_bank_cb.h"
-#include "command_buffer/common/cross/gapi_interface.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
+#include "command_buffer/common/gapi_interface.h"
+#include "command_buffer/client/o3d_cmd_helper.h"
 
 // TODO: add unit tests.
 
diff --git a/o3d/core/cross/command_buffer/stream_bank_cb.h b/o3d/core/cross/command_buffer/stream_bank_cb.h
index 015ff2d..bef497e 100644
--- a/o3d/core/cross/command_buffer/stream_bank_cb.h
+++ b/o3d/core/cross/command_buffer/stream_bank_cb.h
@@ -37,7 +37,7 @@
 
 #include "core/cross/precompile.h"
 #include "core/cross/stream_bank.h"
-#include "command_buffer/common/cross/resource.h"
+#include "command_buffer/common/resource.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/texture_cb.cc b/o3d/core/cross/command_buffer/texture_cb.cc
index f0e45fa..31c1c15 100644
--- a/o3d/core/cross/command_buffer/texture_cb.cc
+++ b/o3d/core/cross/command_buffer/texture_cb.cc
@@ -38,10 +38,10 @@
 #include "core/cross/command_buffer/renderer_cb.h"
 #include "core/cross/command_buffer/texture_cb.h"
 
-#include "command_buffer/common/cross/o3d_cmd_format.h"
-#include "command_buffer/common/cross/resource.h"
-#include "command_buffer/client/cross/o3d_cmd_helper.h"
-#include "command_buffer/client/cross/fenced_allocator.h"
+#include "command_buffer/common/o3d_cmd_format.h"
+#include "command_buffer/common/resource.h"
+#include "command_buffer/client/o3d_cmd_helper.h"
+#include "command_buffer/client/fenced_allocator.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/texture_cb.h b/o3d/core/cross/command_buffer/texture_cb.h
index 3c710fa..6fd21da 100644
--- a/o3d/core/cross/command_buffer/texture_cb.h
+++ b/o3d/core/cross/command_buffer/texture_cb.h
@@ -39,7 +39,7 @@
 #include "core/cross/bitmap.h"
 #include "core/cross/texture.h"
 #include "core/cross/types.h"
-#include "command_buffer/common/cross/resource.h"
+#include "command_buffer/common/resource.h"
 #include "core/cross/command_buffer/render_surface_cb.h"
 
 namespace o3d {