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 /gpu/demos | |
| 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 'gpu/demos')
| -rw-r--r-- | gpu/demos/framework/window.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gpu/demos/framework/window.cc b/gpu/demos/framework/window.cc index 574ab58..d30e427 100644 --- a/gpu/demos/framework/window.cc +++ b/gpu/demos/framework/window.cc @@ -4,8 +4,6 @@ #include "gpu/demos/framework/window.h" -#include <vector> - #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/ref_counted.h" @@ -79,9 +77,7 @@ bool Window::CreateRenderContext(gfx::AcceleratedWidget hwnd) { return false; } - gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(NULL, - true, - NULL)); + gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(NULL, true)); decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get())); if (!decoder_.get()) |