From 7f1a51c32f9c8c5a44118483c1255328d7983fce Mon Sep 17 00:00:00 2001 From: "gman@chromium.org" Date: Thu, 19 Jul 2012 18:52:02 +0000 Subject: Revert 147328 - Current status of patch: - In-memory cache - maximum in memory limit (currently 6mb) - lru eviction - Cache includes saving the attribute + uniform mappings Wiring: - Added bindings for glProgramBinary and glGetProgramBinary - Plumbed the shader cache from gl_channel_manager to program_manager Refactoring: - moved the meat of DoCompile to the ProgramManager New: - added field to ShaderInfo to store if we have a possible pending cache compile - exposed attrib_map and uniform_map in ShaderInfo for the cache - program_cache base class with in-memory status storage - Simple memory_program_cache implementation, stores programs with lru eviction - Added caching logic to DoCompileShader in gles2_cmd_decoder and Link in program_manager Design doc: https://docs.google.com/document/d/1Vceem-nF4TCICoeGSh7OMXxfGuJEJYblGXRgN9V9hcE/edit BUG=88572 Review URL: https://chromiumcodereview.appspot.com/10534173 TBR=dmurph@chromium.org Review URL: https://chromiumcodereview.appspot.com/10795037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147497 0039d316-1c4b-4281-b951-d872f2087c98 --- content/common/gpu/gpu_command_buffer_stub.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'content/common/gpu/gpu_command_buffer_stub.cc') diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc index 7797b1d..6a281e4 100644 --- a/content/common/gpu/gpu_command_buffer_stub.cc +++ b/content/common/gpu/gpu_command_buffer_stub.cc @@ -79,8 +79,7 @@ GpuCommandBufferStub::GpuCommandBufferStub( int32 surface_id, GpuWatchdog* watchdog, bool software, - const GURL& active_url, - gpu::gles2::ProgramCache* program_cache) + const GURL& active_url) : channel_(channel), handle_(handle), initial_size_(size), @@ -104,9 +103,7 @@ GpuCommandBufferStub::GpuCommandBufferStub( if (share_group) { context_group_ = share_group->context_group_; } else { - context_group_ = new gpu::gles2::ContextGroup(mailbox_manager, - true, - program_cache); + context_group_ = new gpu::gles2::ContextGroup(mailbox_manager, true); } if (surface_id != 0) surface_state_.reset(new GpuCommandBufferStubBase::SurfaceState( -- cgit v1.1