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

1 files changed, 0 insertions, 85 deletions

diff --git a/o3d/gpu_plugin/gpu_processor_win.cc b/o3d/gpu_plugin/gpu_processor_win.cc
deleted file mode 100644
index 21a1c4a..0000000
--- a/o3d/gpu_plugin/gpu_processor_win.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <windows.h>
-
-#include "o3d/gpu_plugin/gpu_processor.h"
-
-using ::base::SharedMemory;
-
-namespace gpu_plugin {
-
-GPUProcessor::GPUProcessor(NPP npp,
-                           CommandBuffer* command_buffer)
-    : npp_(npp),
-      command_buffer_(command_buffer),
-      commands_per_update_(100) {
-  DCHECK(command_buffer);
-  gapi_.reset(new GPUGAPIInterface);
-  decoder_.reset(new command_buffer::o3d::GAPIDecoder(gapi_.get()));
-  decoder_->set_engine(this);
-}
-
-GPUProcessor::GPUProcessor(NPP npp,
-                           CommandBuffer* command_buffer,
-                           GPUGAPIInterface* gapi,
-                           command_buffer::o3d::GAPIDecoder* decoder,
-                           command_buffer::CommandParser* parser,
-                           int commands_per_update)
-    : npp_(npp),
-      command_buffer_(command_buffer),
-      commands_per_update_(commands_per_update) {
-  DCHECK(command_buffer);
-  gapi_.reset(gapi);
-  decoder_.reset(decoder);
-  parser_.reset(parser);
-}
-
-bool GPUProcessor::Initialize(HWND handle) {
-  DCHECK(handle);
-
-  // Cannot reinitialize.
-  if (gapi_->hwnd() != NULL)
-    return false;
-
-  // Map the ring buffer and create the parser.
-  SharedMemory* ring_buffer = command_buffer_->GetRingBuffer();
-  if (ring_buffer) {
-    size_t size = ring_buffer->max_size();
-    if (!ring_buffer->Map(size)) {
-      return false;
-    }
-
-    void* ptr = ring_buffer->memory();
-    parser_.reset(new command_buffer::CommandParser(ptr, size, 0, size, 0,
-                                                    decoder_.get()));
-  } else {
-    parser_.reset(new command_buffer::CommandParser(NULL, 0, 0, 0, 0,
-                                                    decoder_.get()));
-  }
-
-  // Initialize GAPI immediately if the window handle is valid.
-  gapi_->set_hwnd(handle);
-  return gapi_->Initialize();
-}
-
-void GPUProcessor::Destroy() {
-  // Destroy GAPI if window handle has not already become invalid.
-  if (gapi_->hwnd()) {
-    gapi_->Destroy();
-    gapi_->set_hwnd(NULL);
-  }
-}
-
-bool GPUProcessor::SetWindow(HWND handle, int width, int height) {
-  if (handle == NULL) {
-    // Destroy GAPI when the window handle becomes invalid.
-    Destroy();
-    return true;
-  } else {
-    return Initialize(handle);
-  }
-}
-
-}  // namespace gpu_plugin