Removed O3D command buffer protocol code and O3D comand buffer configuration.

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

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

3 files changed, 0 insertions, 43 deletions

diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp
index 11b4d33..f2773ec 100644
--- a/o3d/core/core.gyp
+++ b/o3d/core/core.gyp
@@ -395,45 +395,6 @@
             ],
           },
         ],
-        ['renderer == "cb"',
-          {
-            'dependencies': [
-              '../gpu/gpu.gyp:command_buffer_client',
-              '../gpu/gpu.gyp:np_utils',
-            ],
-            'sources': [
-              'cross/command_buffer/buffer_cb.cc',
-              'cross/command_buffer/buffer_cb.h',
-              'cross/command_buffer/effect_cb.cc',
-              'cross/command_buffer/effect_cb.h',
-              'cross/command_buffer/install_check.cc',
-              'cross/command_buffer/install_check.h',
-              'cross/command_buffer/param_cache_cb.cc',
-              'cross/command_buffer/param_cache_cb.h',
-              'cross/command_buffer/primitive_cb.cc',
-              'cross/command_buffer/primitive_cb.h',
-              'cross/command_buffer/renderer_cb.cc',
-              'cross/command_buffer/renderer_cb.h',
-              'cross/command_buffer/render_surface_cb.cc',
-              'cross/command_buffer/render_surface_cb.h',
-              'cross/command_buffer/sampler_cb.cc',
-              'cross/command_buffer/sampler_cb.h',
-              'cross/command_buffer/states_cb.cc',
-              'cross/command_buffer/states_cb.h',
-              'cross/command_buffer/stream_bank_cb.cc',
-              'cross/command_buffer/stream_bank_cb.h',
-              'cross/command_buffer/texture_cb.cc',
-              'cross/command_buffer/texture_cb.h',
-            ],
-          },
-        ],
-        ['renderer == "cb" and cb_service != "remote"',
-          {
-            'dependencies': [
-              '../gpu/gpu.gyp:command_buffer_service',
-            ],
-          },
-        ],
       ],
     },
     {
diff --git a/o3d/core/cross/renderer_platform.h b/o3d/core/cross/renderer_platform.h
index f512d9a..639459e 100644
--- a/o3d/core/cross/renderer_platform.h
+++ b/o3d/core/cross/renderer_platform.h
@@ -64,8 +64,6 @@
 #include "core/win/d3d9/renderer_d3d9.h"
 #elif defined(RENDERER_GL)
 #include "core/cross/gl/renderer_gl.h"
-#elif defined(RENDERER_CB)
-#include "core/cross/command_buffer/renderer_cb.h"
 #else
 #error Renderer not recognized.
 #endif
diff --git a/o3d/core/cross/renderer_test.cc b/o3d/core/cross/renderer_test.cc
index 2cde1a9..190aabc 100644
--- a/o3d/core/cross/renderer_test.cc
+++ b/o3d/core/cross/renderer_test.cc
@@ -81,7 +81,6 @@ TEST_F(RendererTest, InitAndDestroyRenderer) {
 // TODO(apatrick): This test will not work as is with command buffers because
 //     it attempts to create a Renderer using the same ring buffer as the
 //     Renderer created in main.
-#if !defined(RENDERER_CB)
   scoped_ptr<Renderer> renderer(
       Renderer::CreateDefaultRenderer(service_locator()));
   EXPECT_TRUE(renderer->Init(*g_display_window, false));
@@ -104,7 +103,6 @@ TEST_F(RendererTest, InitAndDestroyRenderer) {
   // check that the renderer no longer has a Cg Context.
   EXPECT_FALSE(gl_renderer->cg_context() != NULL);
 #endif
-#endif  // RENDERER_CB
 }
 
 // Offscreen is only supported on D3D currently