diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 18:33:08 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 18:33:08 +0000 |
| commit | 6e8abf638e8bec81426f651b3e85a258f476f43a (patch) | |
| tree | 6301f059616590e37d91eaf69bec685044b7fdf0 /o3d/plugin | |
| parent | 1c8ba9c3a84724d3116a50cd96431c8bc6d9e848 (diff) | |
| download | chromium_src-6e8abf638e8bec81426f651b3e85a258f476f43a.zip chromium_src-6e8abf638e8bec81426f651b3e85a258f476f43a.tar.gz chromium_src-6e8abf638e8bec81426f651b3e85a258f476f43a.tar.bz2 | |
Reorganized command buffer and GPU plugin code into following structure:
gpu/gpu.gyp
gpu/command_buffer/...
gpu/gpu_plugin/...
gpu/np_utils/...
And fixed up paths and header sentry macros. Also merged command_buffer.gyp into gpu.gyp.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
| -rw-r--r-- | o3d/plugin/cross/o3d_glue.cc | 6 | ||||
| -rw-r--r-- | o3d/plugin/plugin.gyp | 2 | ||||
| -rw-r--r-- | o3d/plugin/win/main_win.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/o3d/plugin/cross/o3d_glue.cc b/o3d/plugin/cross/o3d_glue.cc index f2cfb4f..075ca5d 100644 --- a/o3d/plugin/cross/o3d_glue.cc +++ b/o3d/plugin/cross/o3d_glue.cc @@ -40,9 +40,9 @@ #include "core/cross/renderer.h" #include "core/cross/client_info.h" #include "core/cross/command_buffer/display_window_cb.h" -#include "gpu_plugin/np_utils/np_headers.h" -#include "gpu_plugin/np_utils/np_object_pointer.h" -#include "gpu_plugin/np_utils/np_utils.h" +#include "gpu/np_utils/np_headers.h" +#include "gpu/np_utils/np_object_pointer.h" +#include "gpu/np_utils/np_utils.h" #include "plugin/cross/o3d_glue.h" #include "plugin/cross/config.h" #include "plugin/cross/stream_manager.h" diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 10cb1c4..c128c70 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -50,7 +50,7 @@ '../../v8/tools/gyp/v8.gyp:v8', '../core/core.gyp:o3dCore', '../core/core.gyp:o3dCorePlatform', - '../gpu_plugin/gpu_plugin.gyp:np_utils', + '../gpu/gpu.gyp:np_utils', '../import/archive.gyp:o3dArchive', '../utils/utils.gyp:o3dUtils', '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc', diff --git a/o3d/plugin/win/main_win.cc b/o3d/plugin/win/main_win.cc index 785e771..13cfc12 100644 --- a/o3d/plugin/win/main_win.cc +++ b/o3d/plugin/win/main_win.cc @@ -54,7 +54,7 @@ #if defined(RENDERER_CB) #include "core/cross/command_buffer/renderer_cb.h" #include "core/cross/command_buffer/display_window_cb.h" -#include "gpu_plugin/command_buffer.h" +#include "gpu/gpu_plugin/command_buffer.h" #endif using glue::_o3d::PluginObject; |