| Index: gpu/demos/framework/window.cc
|
| diff --git a/gpu/demos/framework/window.cc b/gpu/demos/framework/window.cc
|
| index d30e42733fef8fe0008d535e218b8a2c6e2f42d0..6cf66d43303d945c7969af69f57627385fcebd6a 100644
|
| --- a/gpu/demos/framework/window.cc
|
| +++ b/gpu/demos/framework/window.cc
|
| @@ -8,6 +8,7 @@
|
| #include "base/bind_helpers.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/memory/weak_ptr.h"
|
| #include "gpu/command_buffer/client/gles2_implementation.h"
|
| #include "gpu/command_buffer/client/gles2_lib.h"
|
| #include "gpu/command_buffer/client/transfer_buffer.h"
|
| @@ -29,6 +30,8 @@ const int32 kTransferBufferSize = 512 * 1024;
|
| } // namespace.
|
|
|
| namespace gpu {
|
| +class ShaderCache;
|
| +
|
| namespace demos {
|
|
|
| Window::Window()
|
| @@ -77,7 +80,10 @@ bool Window::CreateRenderContext(gfx::AcceleratedWidget hwnd) {
|
| return false;
|
| }
|
|
|
| - gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(NULL, true));
|
| + gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(
|
| + NULL,
|
| + true,
|
| + base::WeakPtr<ShaderCache>()));
|
|
|
| decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get()));
|
| if (!decoder_.get())
|
|
|