summaryrefslogtreecommitdiffstats
path: root/o3d/gpu_plugin/gpu_processor_win.cc
diff options
context:
space:
mode:
authorapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-19 18:43:09 +0000
committerapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-19 18:43:09 +0000
commit52f88d8d6be4ddfad56c25d3c9a13cd22a768628 (patch)
treeccf9de7149854ab9c04fe451fb8b58a9de41e9d4 /o3d/gpu_plugin/gpu_processor_win.cc
parent52d08b12e8e7ff7c9b865837a2aeb17fb9dc2d42 (diff)
downloadchromium_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/gpu_plugin/gpu_processor_win.cc')
-rw-r--r--o3d/gpu_plugin/gpu_processor_win.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/o3d/gpu_plugin/gpu_processor_win.cc b/o3d/gpu_plugin/gpu_processor_win.cc
index 30f963f..a9fdae1 100644
--- a/o3d/gpu_plugin/gpu_processor_win.cc
+++ b/o3d/gpu_plugin/gpu_processor_win.cc
@@ -10,17 +10,18 @@ namespace o3d {
namespace gpu_plugin {
GPUProcessor::GPUProcessor(NPP npp,
- const NPObjectPointer<CommandBuffer>& command_buffer)
+ CommandBuffer* command_buffer)
: npp_(npp),
command_buffer_(command_buffer),
commands_per_update_(100) {
+ DCHECK(command_buffer);
gapi_.reset(new command_buffer::GAPID3D9);
decoder_.reset(new command_buffer::GAPIDecoder(gapi_.get()));
decoder_->set_engine(this);
}
GPUProcessor::GPUProcessor(NPP npp,
- const NPObjectPointer<CommandBuffer>& command_buffer,
+ CommandBuffer* command_buffer,
command_buffer::GAPID3D9* gapi,
command_buffer::GAPIDecoder* decoder,
command_buffer::CommandParser* parser,
@@ -28,6 +29,7 @@ GPUProcessor::GPUProcessor(NPP npp,
: npp_(npp),
command_buffer_(command_buffer),
commands_per_update_(commands_per_update) {
+ DCHECK(command_buffer);
gapi_.reset(gapi);
decoder_.reset(decoder);
parser_.reset(parser);