| Index: gpu/gles2_conform_support/egl/display.cc
|
| diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc
|
| index 4c1c59dcf7e1ffbc03edf4380c0b3c51bfc88b24..3247266844090a8108f8dc8bb343abcbdaa98da9 100644
|
| --- a/gpu/gles2_conform_support/egl/display.cc
|
| +++ b/gpu/gles2_conform_support/egl/display.cc
|
| @@ -7,6 +7,7 @@
|
| #include <vector>
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| +#include "base/memory/weak_ptr.h"
|
| #include "gpu/command_buffer/client/gles2_lib.h"
|
| #include "gpu/command_buffer/client/transfer_buffer.h"
|
| #include "gpu/command_buffer/service/context_group.h"
|
| @@ -14,11 +15,17 @@
|
| #include "gpu/gles2_conform_support/egl/config.h"
|
| #include "gpu/gles2_conform_support/egl/surface.h"
|
|
|
| +using base::WeakPtr;
|
| +
|
| namespace {
|
| const int32 kCommandBufferSize = 1024 * 1024;
|
| const int32 kTransferBufferSize = 512 * 1024;
|
| }
|
|
|
| +namespace gpu {
|
| +class ShaderCache;
|
| +}
|
| +
|
| namespace egl {
|
|
|
| Display::Display(EGLNativeDisplayType display_id)
|
| @@ -93,7 +100,10 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config,
|
| if (!command_buffer->Initialize())
|
| return NULL;
|
|
|
| - gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(NULL, true));
|
| + gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(
|
| + NULL,
|
| + true,
|
| + base::WeakPtr<gpu::ShaderCache>()));
|
|
|
| decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get()));
|
| if (!decoder_.get())
|
|
|