diff options
author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 00:41:08 +0000 |
---|---|---|
committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 00:41:08 +0000 |
commit | f90ef342b3dcacd675f630caa63626573cfe032a (patch) | |
tree | 724d4466908a72d5bee0abd8ec0bb437acd26810 /o3d/tests | |
parent | 07f25e82ef962a56a791d115720f57957d84d782 (diff) | |
download | chromium_src-f90ef342b3dcacd675f630caa63626573cfe032a.zip chromium_src-f90ef342b3dcacd675f630caa63626573cfe032a.tar.gz chromium_src-f90ef342b3dcacd675f630caa63626573cfe032a.tar.bz2 |
Switched from NPObject shared memory wrapper to Chrome shared memory in preparation for moving from NPAPI to Chrome IPC for synchronous messages.
Started work on an O3D configuration that will use Pepper 3D to connect to a remote GPU plugin. This is not building yet.
Updated to latest NPAPI from nixysa.
Review URL: http://codereview.chromium.org/371074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests')
-rw-r--r-- | o3d/tests/tests.gyp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp index 8942228..27e48a6 100644 --- a/o3d/tests/tests.gyp +++ b/o3d/tests/tests.gyp @@ -105,10 +105,16 @@ ['renderer == "cb"', { 'dependencies': [ + '../gpu_plugin/gpu_plugin.gyp:np_utils', + ] + }, + ], + ['renderer == "cb" and cb_service != "remote"', + { + 'dependencies': [ '../command_buffer/command_buffer.gyp:command_buffer_client_test', '../command_buffer/command_buffer.gyp:command_buffer_common_test', '../command_buffer/command_buffer.gyp:command_buffer_service_test', - '../gpu_plugin/gpu_plugin.gyp:np_utils', ] }, ], |