diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 18:52:02 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 18:52:02 +0000 |
| commit | 7f1a51c32f9c8c5a44118483c1255328d7983fce (patch) | |
| tree | 5ca178adcc32507a067827922332f39c8bd64135 /webkit/gpu | |
| parent | afaaacd757849f6f9117aa99bd582f52a152aa9c (diff) | |
| download | chromium_src-7f1a51c32f9c8c5a44118483c1255328d7983fce.zip chromium_src-7f1a51c32f9c8c5a44118483c1255328d7983fce.tar.gz chromium_src-7f1a51c32f9c8c5a44118483c1255328d7983fce.tar.bz2 | |
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
Diffstat (limited to 'webkit/gpu')
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 5a5d1cd..b7e93df 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -12,7 +12,6 @@ #include <algorithm> #include <set> -#include <string> #include "base/bind.h" #include "base/bind_helpers.h" @@ -414,9 +413,7 @@ 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, - NULL))); + new ::gpu::gles2::ContextGroup(NULL, bind_generates_resource))); gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(), decoder_.get(), |