diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 18:43:09 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 18:43:09 +0000 |
| commit | 52f88d8d6be4ddfad56c25d3c9a13cd22a768628 (patch) | |
| tree | ccf9de7149854ab9c04fe451fb8b58a9de41e9d4 /o3d/build | |
| parent | 52d08b12e8e7ff7c9b865837a2aeb17fb9dc2d42 (diff) | |
| download | chromium_src-52f88d8d6be4ddfad56c25d3c9a13cd22a768628.zip chromium_src-52f88d8d6be4ddfad56c25d3c9a13cd22a768628.tar.gz chromium_src-52f88d8d6be4ddfad56c25d3c9a13cd22a768628.tar.bz2 | |
Changed O3D to use CommandBuffer in-process. Still not connecting to the GPU plugin.
I removed all the NaCl dependencies. Synchronous messages are now sent by NPAPI.
Removed BufferSyncInterface and replaced it with CommandBuffer. CommandBufferHelper now uses NPAPI.
Changed some unsigned ints to int32s because NPAPI doesn't support unsigned int.
There are now two subclasses of RendererCB. RendererCBLocal is for use with an in-process CommandBuffer. RendererCBRemote is for use with an out-of-process CommandBuffer.
I'm going to rearrange the locations of the source files under gpu_plugin next. CommandBuffer and GPUProcessor probably belong in the command_buffer_service library now. np_utils and system_services should be standalone libraries.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/266068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build')
| -rw-r--r-- | o3d/build/common.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index 9f058c4..ca2b697 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -21,12 +21,12 @@ 'skiadir': 'third_party/skia/include', 'zlibdir': 'third_party/zlib', # If the DEPS file exists two levels up, then we're in a Chrome tree. - 'o3d_in_chrome%': '<!(python <(DEPTH)/o3d/build/file_exists.py ../../DEPS)', + 'o3d_in_chrome%': '<!(python <(DEPTH)/o3d/build/file_exists.py <(DEPTH)/DEPS)', # We default to building everything only if the assets exist. # (and the teapot is the least likely asset to change). # This is so that chrome developers get a much reduced dependency set. 'o3d_developer%': '<!(python <(DEPTH)/o3d/build/file_exists.py ' - '../o3d_assets/samples/convert_assets/teapot.zip)', + '<(DEPTH)/o3d/o3d_assets/samples/convert_assets/teapot.zip)', 'selenium_screenshots%': 0, 'conditions' : [ # These have to come first because GYP doesn't like it when @@ -72,7 +72,7 @@ }], ], 'conditions': [ - ['o3d_in_chrome != 0', + ['o3d_in_chrome == "True"', { 'defines': [ 'O3D_IN_CHROME', |