Reverting 31676.

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

20 files changed, 48 insertions, 48 deletions

diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp
index 1f3afa8..cd2a8d9 100644
--- a/o3d/core/core.gyp
+++ b/o3d/core/core.gyp
@@ -398,8 +398,8 @@
         ['renderer == "cb"',
           {
             'dependencies': [
-              '../gpu/gpu.gyp:command_buffer_client',
-              '../gpu/gpu.gyp:np_utils',
+              '../command_buffer/command_buffer.gyp:command_buffer_client',
+              '../gpu_plugin/gpu_plugin.gyp:np_utils',
             ],
             'sources': [
               'cross/command_buffer/buffer_cb.cc',
@@ -430,11 +430,11 @@
         ['renderer == "cb" and cb_service != "remote"',
           {
             'dependencies': [
-              '../gpu/gpu.gyp:command_buffer_service',
+              '../command_buffer/command_buffer.gyp:command_buffer_service',
 
               # These dependencies are only needed for RendererCBLocal. They can
               # be removed when RendererCBLocal is not needed.
-              '../gpu/gpu.gyp:command_buffer',
+              '../gpu_plugin/gpu_plugin.gyp:command_buffer',
             ],
           },
         ],
diff --git a/o3d/core/cross/command_buffer/buffer_cb.cc b/o3d/core/cross/command_buffer/buffer_cb.cc
index 301dfa7..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 "gpu/command_buffer/client/o3d_cmd_helper.h"
-#include "gpu/command_buffer/client/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/display_window_cb.h b/o3d/core/cross/command_buffer/display_window_cb.h
index 74486bf..06b494e 100644
--- a/o3d/core/cross/command_buffer/display_window_cb.h
+++ b/o3d/core/cross/command_buffer/display_window_cb.h
@@ -34,8 +34,8 @@
 #define O3D_CORE_WIN_DISPLAY_WINDOW_CB_H_
 
 #include "core/cross/display_window.h"
-#include "gpu/gpu_plugin/command_buffer.h"
-#include "gpu/np_utils/np_object_pointer.h"
+#include "gpu_plugin/command_buffer.h"
+#include "gpu_plugin/np_utils/np_object_pointer.h"
 
 namespace o3d {
 
diff --git a/o3d/core/cross/command_buffer/effect_cb.cc b/o3d/core/cross/command_buffer/effect_cb.cc
index 9e860dd..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 "gpu/command_buffer/common/constants.h"
-#include "gpu/command_buffer/common/o3d_cmd_format.h"
-#include "gpu/command_buffer/client/fenced_allocator.h"
-#include "gpu/command_buffer/client/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 21b4d7c..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 "gpu/command_buffer/client/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 5c5f64e..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 "gpu/command_buffer/common/o3d_cmd_format.h"
-#include "gpu/command_buffer/client/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 f97039a..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 "gpu/command_buffer/common/gapi_interface.h"
-#include "gpu/command_buffer/client/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 955150c..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 "gpu/command_buffer/common/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 83ebce4..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 "gpu/command_buffer/client/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 3028b6f..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 "gpu/command_buffer/common/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 a6a07d8..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 "gpu/command_buffer/client/o3d_cmd_helper.h"
-#include "gpu/command_buffer/client/fenced_allocator.h"
-#include "gpu/command_buffer/common/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"
@@ -49,13 +49,13 @@
 #include "core/cross/command_buffer/texture_cb.h"
 #include "core/cross/command_buffer/display_window_cb.h"
 #include "core/cross/renderer_platform.h"
-#include "gpu/gpu_plugin/command_buffer.h"
-#include "gpu/gpu_plugin/gpu_processor.h"
-#include "gpu/np_utils/np_browser.h"
-#include "gpu/np_utils/np_utils.h"
+#include "gpu_plugin/command_buffer.h"
+#include "gpu_plugin/gpu_processor.h"
+#include "gpu_plugin/np_utils/np_browser.h"
+#include "gpu_plugin/np_utils/np_utils.h"
 
 #if !defined(CB_SERVICE_REMOTE)
-#include "gpu/gpu_plugin/gpu_processor.h"
+#include "gpu_plugin/gpu_processor.h"
 #endif
 
 namespace o3d {
diff --git a/o3d/core/cross/command_buffer/renderer_cb.h b/o3d/core/cross/command_buffer/renderer_cb.h
index 9168bb5..a424922 100644
--- a/o3d/core/cross/command_buffer/renderer_cb.h
+++ b/o3d/core/cross/command_buffer/renderer_cb.h
@@ -39,12 +39,12 @@
 #include "core/cross/precompile.h"
 #include <vector>
 #include "core/cross/renderer.h"
-#include "gpu/command_buffer/common/constants.h"
-#include "gpu/command_buffer/common/resource.h"
-#include "gpu/command_buffer/client/fenced_allocator.h"
-#include "gpu/command_buffer/client/id_allocator.h"
-#include "gpu/gpu_plugin/command_buffer.h"
-#include "gpu/np_utils/np_object_pointer.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"
 
 namespace command_buffer {
 class O3DCmdHelper;
diff --git a/o3d/core/cross/command_buffer/sampler_cb.cc b/o3d/core/cross/command_buffer/sampler_cb.cc
index 887b9ad..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 "gpu/command_buffer/common/o3d_cmd_format.h"
-#include "gpu/command_buffer/client/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 25892d55..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 "gpu/command_buffer/common/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 8572827d..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 "gpu/command_buffer/common/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 0732978..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 "gpu/command_buffer/common/o3d_cmd_format.h"
-#include "gpu/command_buffer/client/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 d7aebf4..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 "gpu/command_buffer/common/gapi_interface.h"
-#include "gpu/command_buffer/client/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 4f0656c..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 "gpu/command_buffer/common/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 8793339..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 "gpu/command_buffer/common/o3d_cmd_format.h"
-#include "gpu/command_buffer/common/resource.h"
-#include "gpu/command_buffer/client/o3d_cmd_helper.h"
-#include "gpu/command_buffer/client/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 9e37023..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 "gpu/command_buffer/common/resource.h"
+#include "command_buffer/common/resource.h"
 #include "core/cross/command_buffer/render_surface_cb.h"
 
 namespace o3d {