summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/memory_program_cache_unittest.cc
diff options
context:
space:
mode:
authordsinclair@chromium.org <dsinclair@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-08 23:36:44 +0000
committerdsinclair@chromium.org <dsinclair@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-08 23:36:44 +0000
commitdf5ba6bcf2bd3a6b873b7bdc3001c40ac2a9536f (patch)
treedd99336d4f0ce8ee2e5cfda689814234fd78257e /gpu/command_buffer/service/memory_program_cache_unittest.cc
parent66b6f3215455faf46d85a119f91d11a8e632ceeb (diff)
downloadchromium_src-df5ba6bcf2bd3a6b873b7bdc3001c40ac2a9536f.zip
chromium_src-df5ba6bcf2bd3a6b873b7bdc3001c40ac2a9536f.tar.gz
chromium_src-df5ba6bcf2bd3a6b873b7bdc3001c40ac2a9536f.tar.bz2
Disable shader disk cache by default.
The code to handle cache clearing didn't land in time for the M27 branch so it has been decided to disable this feature for M27. This patch will be rolled back after it lands on the M27 branch. BUG=228989 Review URL: https://chromiumcodereview.appspot.com/13800013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/memory_program_cache_unittest.cc')
-rw-r--r--gpu/command_buffer/service/memory_program_cache_unittest.cc36
1 files changed, 0 insertions, 36 deletions
diff --git a/gpu/command_buffer/service/memory_program_cache_unittest.cc b/gpu/command_buffer/service/memory_program_cache_unittest.cc
index f20caeb..f9d4c23 100644
--- a/gpu/command_buffer/service/memory_program_cache_unittest.cc
+++ b/gpu/command_buffer/service/memory_program_cache_unittest.cc
@@ -204,37 +204,6 @@ TEST_F(MemoryProgramCacheTest, CacheSave) {
*vertex_shader_->deferred_compilation_source(),
*fragment_shader_->deferred_compilation_source(),
NULL));
- EXPECT_EQ(1, shader_cache_count());
-}
-
-TEST_F(MemoryProgramCacheTest, LoadProgram) {
- const GLenum kFormat = 1;
- const int kProgramId = 10;
- const int kBinaryLength = 20;
- char test_binary[kBinaryLength];
- for (int i = 0; i < kBinaryLength; ++i) {
- test_binary[i] = i;
- }
- ProgramBinaryEmulator emulator(kBinaryLength, kFormat, test_binary);
-
- SetExpectationsForSaveLinkedProgram(kProgramId, &emulator);
- cache_->SaveLinkedProgram(kProgramId, vertex_shader_, fragment_shader_, NULL,
- base::Bind(&MemoryProgramCacheTest::ShaderCacheCb,
- base::Unretained(this)));
-
- EXPECT_EQ(ProgramCache::LINK_SUCCEEDED, cache_->GetLinkedProgramStatus(
- *vertex_shader_->deferred_compilation_source(),
- *fragment_shader_->deferred_compilation_source(),
- NULL));
- EXPECT_EQ(1, shader_cache_count());
-
- cache_->Clear();
-
- cache_->LoadProgram(shader_cache_shader());
- EXPECT_EQ(ProgramCache::LINK_SUCCEEDED, cache_->GetLinkedProgramStatus(
- *vertex_shader_->deferred_compilation_source(),
- *fragment_shader_->deferred_compilation_source(),
- NULL));
}
TEST_F(MemoryProgramCacheTest, CacheLoadMatchesSave) {
@@ -251,7 +220,6 @@ TEST_F(MemoryProgramCacheTest, CacheLoadMatchesSave) {
cache_->SaveLinkedProgram(kProgramId, vertex_shader_, fragment_shader_, NULL,
base::Bind(&MemoryProgramCacheTest::ShaderCacheCb,
base::Unretained(this)));
- EXPECT_EQ(1, shader_cache_count());
VariableMap vertex_attrib_map = vertex_shader_->attrib_map();
VariableMap vertex_uniform_map = vertex_shader_->uniform_map();
@@ -295,7 +263,6 @@ TEST_F(MemoryProgramCacheTest, LoadProgramMatchesSave) {
cache_->SaveLinkedProgram(kProgramId, vertex_shader_, fragment_shader_, NULL,
base::Bind(&MemoryProgramCacheTest::ShaderCacheCb,
base::Unretained(this)));
- EXPECT_EQ(1, shader_cache_count());
VariableMap vertex_attrib_map = vertex_shader_->attrib_map();
VariableMap vertex_uniform_map = vertex_shader_->uniform_map();
@@ -309,9 +276,6 @@ TEST_F(MemoryProgramCacheTest, LoadProgramMatchesSave) {
SetExpectationsForLoadLinkedProgram(kProgramId, &emulator);
- cache_->Clear();
- cache_->LoadProgram(shader_cache_shader());
-
EXPECT_EQ(ProgramCache::PROGRAM_LOAD_SUCCESS, cache_->LoadLinkedProgram(
kProgramId,
vertex_shader_,