summaryrefslogtreecommitdiffstats
path: root/gpu/gles2_conform_support/egl
diff options
context:
space:
mode:
Diffstat (limited to 'gpu/gles2_conform_support/egl')
-rw-r--r--gpu/gles2_conform_support/egl/display.cc8
-rw-r--r--gpu/gles2_conform_support/egl/display.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc
index a81b2b1..4c1c59d 100644
--- a/gpu/gles2_conform_support/egl/display.cc
+++ b/gpu/gles2_conform_support/egl/display.cc
@@ -10,6 +10,7 @@
#include "gpu/command_buffer/client/gles2_lib.h"
#include "gpu/command_buffer/client/transfer_buffer.h"
#include "gpu/command_buffer/service/context_group.h"
+#include "gpu/command_buffer/service/transfer_buffer_manager.h"
#include "gpu/gles2_conform_support/egl/config.h"
#include "gpu/gles2_conform_support/egl/surface.h"
@@ -82,8 +83,13 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config,
return EGL_NO_SURFACE;
}
+ {
+ gpu::TransferBufferManager* manager = new gpu::TransferBufferManager();
+ transfer_buffer_manager_.reset(manager);
+ manager->Initialize();
+ }
scoped_ptr<gpu::CommandBufferService> command_buffer(
- new gpu::CommandBufferService);
+ new gpu::CommandBufferService(transfer_buffer_manager_.get()));
if (!command_buffer->Initialize())
return NULL;
diff --git a/gpu/gles2_conform_support/egl/display.h b/gpu/gles2_conform_support/egl/display.h
index 1138fdf..1cec2f9 100644
--- a/gpu/gles2_conform_support/egl/display.h
+++ b/gpu/gles2_conform_support/egl/display.h
@@ -20,6 +20,7 @@ namespace gpu {
class CommandBufferService;
class GpuScheduler;
class TransferBuffer;
+class TransferBufferManagerInterface;
namespace gles2 {
class GLES2CmdHelper;
@@ -66,6 +67,7 @@ class Display {
EGLNativeDisplayType display_id_;
bool is_initialized_;
+ scoped_ptr<gpu::TransferBufferManagerInterface> transfer_buffer_manager_;
scoped_ptr<gpu::CommandBufferService> command_buffer_;
scoped_ptr<gpu::GpuScheduler> gpu_scheduler_;
scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;