Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Unified Diff: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc

Issue 10534173: GPU Program Caching (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« gpu/command_buffer/service/shader_cache.h ('K') | « ui/gl/gl_interface.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
index a2a9d39b2cfc163936b29860c0df4d3839588d3e..6c9c818d1cc7dce9468b9e47b36d0c897a2d87e1 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -20,6 +20,7 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/memory/singleton.h"
+#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
#include "base/metrics/histogram.h"
#include "base/string_tokenizer.h"
@@ -40,6 +41,11 @@
#include "ui/gl/gl_surface.h"
#include "webkit/glue/gl_bindings_skia_cmd_buffer.h"
+
+namespace gpu {
+class ShaderCache;
+}
+
using gpu::Buffer;
using gpu::CommandBuffer;
using gpu::CommandBufferService;
@@ -49,6 +55,7 @@ using gpu::GpuScheduler;
using gpu::TransferBuffer;
using gpu::TransferBufferManager;
using gpu::TransferBufferManagerInterface;
+using gpu::ShaderCache;
namespace webkit {
namespace gpu {
@@ -413,7 +420,9 @@ bool GLInProcessContext::Initialize(const gfx::Size& size,
bool bind_generates_resource = false;
decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group ?
context_group->decoder_->GetContextGroup() :
- new ::gpu::gles2::ContextGroup(NULL, bind_generates_resource)));
+ new ::gpu::gles2::ContextGroup(NULL,
+ bind_generates_resource,
+ base::WeakPtr<ShaderCache>())));
gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(),
decoder_.get(),
« gpu/command_buffer/service/shader_cache.h ('K') | « ui/gl/gl_interface.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698