gpu: Separate GpuControlService from GpuControl

gpu/command_buffer/tests/gl_manager.cc

Index: gpu/command_buffer/tests/gl_manager.cc
diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc
index 3211a35e02fa1b3af596c3e62b846d428db9ef28..1cc997647f559a3fdbcf9ad6e051b8d2d998b5cb 100644
--- a/gpu/command_buffer/tests/gl_manager.cc
+++ b/gpu/command_buffer/tests/gl_manager.cc
@@ -10,6 +10,7 @@
 #include "base/bind.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
+#include "gpu/command_buffer/client/gpu_memory_buffer_factory.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
@@ -44,7 +45,7 @@ GLManager::Options::Options()
       image_manager(NULL) {}
 
 GLManager::GLManager()
-    : context_lost_allowed_(false) {
+    : context_lost_allowed_(false), gpu_memory_buffer_factory_(NULL) {
   SetupBaseContext();
 }
 
@@ -171,12 +172,11 @@ void GLManager::Initialize(const GLManager::Options& options) {
       ::gpu::gles2::DisallowedFeatures(),
       attribs)) << "could not initialize decoder";
 
-  gpu_control_.reset(
+  gpu_control_service_.reset(
       new GpuControlService(decoder_->GetContextGroup()->image_manager(),
-                            options.gpu_memory_buffer_factory,
                             decoder_->GetContextGroup()->mailbox_manager(),
-                            decoder_->GetQueryManager(),
-                            decoder_->GetCapabilities()));
+                            decoder_->GetQueryManager()));
+  gpu_memory_buffer_factory_ = options.gpu_memory_buffer_factory;
 
   command_buffer_->SetPutOffsetChangeCallback(
       base::Bind(&GLManager::PumpCommands, base::Unretained(this)));
@@ -197,7 +197,7 @@ void GLManager::Initialize(const GLManager::Options& options) {
                                      transfer_buffer_.get(),
                                      options.bind_generates_resource,
                                      options.lose_context_when_out_of_memory,
-                                     gpu_control_.get()));
+                                     this));
 
   ASSERT_TRUE(gles2_implementation_->Initialize(
       kStartTransferBufferSize,
@@ -269,4 +269,65 @@ bool GLManager::GetBufferChanged(int32 transfer_buffer_id) {
   return gpu_scheduler_->SetGetBuffer(transfer_buffer_id);
 }
 
+Capabilities GLManager::GetCapabilities() {
+  return decoder_->GetCapabilities();
+}
+
+gfx::GpuMemoryBuffer* GLManager::CreateGpuMemoryBuffer(
+    size_t width,
+    size_t height,
+    unsigned internalformat,
+    int32* id) {
+  *id = -1;
+  scoped_ptr<gfx::GpuMemoryBuffer> buffer(
+      gpu_memory_buffer_factory_->CreateGpuMemoryBuffer(
+          width, height, internalformat));
+  if (!buffer.get())
+    return NULL;
+
+  static int32 next_id = 1;
+  *id = next_id++;
+  gpu_control_service_->RegisterGpuMemoryBuffer(
+      *id, buffer->GetHandle(), width, height, internalformat);
+  gfx::GpuMemoryBuffer* raw_buffer = buffer.get();
+  memory_buffers_.add(*id, buffer.Pass());
+  return raw_buffer;
+}
+
+void GLManager::DestroyGpuMemoryBuffer(int32 id) {
+  memory_buffers_.erase(id);
+  gpu_control_service_->DestroyGpuMemoryBuffer(id);
+}
+
+uint32 GLManager::InsertSyncPoint() {
+  NOTIMPLEMENTED();

[no sievers, 2014/04/23 23:57:29]

Looks like gl_tests do (I mean did, even before your patch) not support sync
points. We should really switch those over to use GLInProcessContext and have at
least one less implementation.

[boliu, 2014/04/24 00:04:02]

Can I do this in follow up?

+  return 0u;
+}
+
+void GLManager::SignalSyncPoint(uint32 sync_point,
+                             const base::Closure& callback) {
+  NOTIMPLEMENTED();
+}
+
+void GLManager::SignalQuery(uint32 query, const base::Closure& callback) {
+  NOTIMPLEMENTED();
+}
+
+void GLManager::SetSurfaceVisible(bool visible) {
+  NOTIMPLEMENTED();
+}
+
+void GLManager::SendManagedMemoryStats(const ManagedMemoryStats& stats) {
+  NOTIMPLEMENTED();
+}
+
+void GLManager::Echo(const base::Closure& callback) {
+  NOTIMPLEMENTED();
+}
+
+uint32 GLManager::CreateStreamTexture(uint32 texture_id) {
+  NOTIMPLEMENTED();
+  return 0;
+}
+
 }  // namespace gpu