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

2 files changed, 4 insertions, 86 deletions

diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi
index ea2c179..e03653d 100644
--- a/o3d/build/common.gypi
+++ b/o3d/build/common.gypi
@@ -21,8 +21,8 @@
     'skiadir': 'third_party/skia/include',
     'zlibdir': 'third_party/zlib',
 
-    # Hack to ensure that these variables (specifically "renderer" and
-    # "cb_service") are available later in the file. Long term solution is late
+    # Hack to ensure that these variables (specifically "renderer") are
+    # available later in the file. Long term solution is late
     # evaluation of variables.
     'variables': {
       # If the DEPS file exists two levels up, then we're in a Chrome tree.
@@ -35,7 +35,6 @@
           {
             'cgdir': 'third_party/cg/files/win',
             'renderer%': 'd3d9',
-            'cb_service%': 'none',
             'swiftshaderdir': 'o3d-internal/third_party/swiftshader/files',
           },
         ],
@@ -43,7 +42,6 @@
           {
             'cgdir': 'third_party/cg/files/mac',
             'renderer%': 'gl',
-            'cb_service%': 'none',
             'swiftshaderdir': '',
           },
         ],
@@ -51,7 +49,6 @@
           {
             'cgdir': 'third_party/cg/files/linux',
             'renderer%': 'gl',
-            'cb_service%': 'none',
             'swiftshaderdir': '',
           },
         ],
@@ -61,7 +58,6 @@
     'renderer%': '<(renderer)',
     'cgdir%': '<(cgdir)',
     'swiftshaderdir%': '<(swiftshaderdir)',
-    'cb_service%': '<(cb_service)',
 
     # We default to building everything only if the assets exist.
     # (and the teapot is the least likely asset to change).
@@ -69,24 +65,6 @@
     'o3d_developer%': '<!(python <(DEPTH)/o3d/build/file_exists.py '
                       '<(DEPTH)/o3d/o3d_assets/samples/convert_assets/teapot.zip)',
     'selenium_screenshots%': 0,
-
-    'conditions' : [
-      ['o3d_in_chrome == "True"',
-        {
-          'renderer': 'cb',
-          'conditions': [
-            ['OS == "win"',
-              {
-                'cb_service': 'd3d9',
-              },
-              {
-                'cb_service': 'gl',
-              },
-            ],
-          ],
-        },
-      ],
-    ],
   },
   'target_defaults': {
     'defines': [
@@ -135,13 +113,6 @@
                 ],
               },
             ],
-            ['renderer == "cb"',
-              {
-                'defines': [
-                  'RENDERER_CB',
-                ],
-              },
-            ],
           ],
         },
       },
@@ -181,13 +152,6 @@
                 ],
               },
             ],
-            ['renderer == "cb"',
-              {
-                'defines': [
-                  'RENDERER_CB',
-                ],
-              },
-            ],
           ],
         },
       },
@@ -216,40 +180,6 @@
                 ],
               },
             ],
-            ['renderer == "cb"',
-              {
-                'defines': [
-                  'RENDERER_CB',
-                ],
-              },
-            ],
-          ],
-        },
-      },
-    ],
-    ['cb_service == "d3d9"',
-      {
-        'target_defaults': {
-          'defines': [
-            'CB_SERVICE_D3D9',
-          ],
-        },
-      },
-    ],
-    ['cb_service == "gl"',
-      {
-        'target_defaults': {
-          'defines': [
-            'CB_SERVICE_GL',
-          ],
-        },
-      },
-    ],
-    ['cb_service == "remote"',
-      {
-        'target_defaults': {
-          'defines': [
-            'CB_SERVICE_REMOTE',
           ],
         },
       },
diff --git a/o3d/build/o3d_all.gyp b/o3d/build/o3d_all.gyp
index d2ab921..b545bd0 100644
--- a/o3d/build/o3d_all.gyp
+++ b/o3d/build/o3d_all.gyp
@@ -36,6 +36,8 @@
         ['OS=="win"',
           {
             'dependencies': [
+              '../gpu/gpu.gyp:gles2_demo',
+              '../gpu/gpu.gyp:gpu_all_unittests',
               '../plugin/plugin.gyp:o3d_host',
             ],
           },
@@ -47,20 +49,6 @@
             ],
           },
         ],
-        ['renderer=="cb"',
-          {
-            'dependencies': [
-              '../gpu/gpu.gyp:gpu_all_unittests',
-            ],
-          },
-        ],
-        ['renderer=="cb" and cb_service=="gl"',
-          {
-            'dependencies': [
-              '../gpu/gpu.gyp:gles2_demo',
-            ],
-          },
-        ],
       ],
     },
   ],