summaryrefslogtreecommitdiffstats
path: root/gpu/demos
diff options
context:
space:
mode:
authordmurph@chromium.org <dmurph@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-18 22:53:31 +0000
committerdmurph@chromium.org <dmurph@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-18 22:53:31 +0000
commitbaa5a89286a0d55e331a779ee6b2f2b5161252b2 (patch)
tree379b3801ee97cd17433805dd1c8e96bae9b70b22 /gpu/demos
parent6c8e0471391c2061644e1eb1ec2808f2d23a1bea (diff)
downloadchromium_src-baa5a89286a0d55e331a779ee6b2f2b5161252b2.zip
chromium_src-baa5a89286a0d55e331a779ee6b2f2b5161252b2.tar.gz
chromium_src-baa5a89286a0d55e331a779ee6b2f2b5161252b2.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos')
-rw-r--r--gpu/demos/framework/window.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/gpu/demos/framework/window.cc b/gpu/demos/framework/window.cc
index d30e427..574ab58 100644
--- a/gpu/demos/framework/window.cc
+++ b/gpu/demos/framework/window.cc
@@ -4,6 +4,8 @@
#include "gpu/demos/framework/window.h"
+#include <vector>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/memory/ref_counted.h"
@@ -77,7 +79,9 @@ 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,
+ NULL));
decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get()));
if (!decoder_.get())