diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 01:03:45 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 01:03:45 +0000 |
| commit | ebc717e8bbba0699fc3527225f622c3e31cbccf1 (patch) | |
| tree | abb47e9c00be4ec42d85c5b2437de91a5fba74c4 /o3d/core/cross | |
| parent | 0e1569d61a3e34999bace10a7ca497b673454ada (diff) | |
| download | chromium_src-ebc717e8bbba0699fc3527225f622c3e31cbccf1.zip chromium_src-ebc717e8bbba0699fc3527225f622c3e31cbccf1.tar.gz chromium_src-ebc717e8bbba0699fc3527225f622c3e31cbccf1.tar.bz2 | |
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
Diffstat (limited to 'o3d/core/cross')
| -rw-r--r-- | o3d/core/cross/renderer_platform.h | 2 | ||||
| -rw-r--r-- | o3d/core/cross/renderer_test.cc | 2 |
2 files changed, 0 insertions, 4 deletions
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 |