diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 16:47:04 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-26 16:47:04 +0000 |
| commit | 4ce9301d7ca308263a9e7c569f50129f37aba634 (patch) | |
| tree | d225b7dda0a77d7dede9b6601279349f9b07b1b6 /gpu/command_buffer/service/memory_program_cache_unittest.cc | |
| parent | 41abb6d9f69fd6e3da44b555107252d709f32105 (diff) | |
| download | chromium_src-4ce9301d7ca308263a9e7c569f50129f37aba634.zip chromium_src-4ce9301d7ca308263a9e7c569f50129f37aba634.tar.gz chromium_src-4ce9301d7ca308263a9e7c569f50129f37aba634.tar.bz2 | |
Revert 195083 "Revert "Revert 193798 "Revert r192949 "Disable sh..."
Still causing automation proxy failures in memory_test on linux perf bots.
BUG=230085
> Revert "Revert 193798 "Revert r192949 "Disable shader disk cache by defa...""
>
> The automation_proxy don't appear in the build run where this was committed.
> Doesn't seem like this is the root cause of the issues.
>
> > Revert 193798 "Revert r192949 "Disable shader disk cache by defa..."
> >
> > Reverting seems to fix memory_test test locally on linux.
> >
> > BUG=230085
> >
> > > Revert r192949 "Disable shader disk cache by default."
> > >
> > > This reverts commit r192949. The disable has been merged into
> > > M27 so re-enabling on trunk.
> > >
> > > BUG=228989
> > >
> > > Review URL: https://chromiumcodereview.appspot.com/13872012
> >
> > TBR=dsinclair@chromium.org
> >
> > Review URL: https://codereview.chromium.org/13924005
>
> TBR=tonyg@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/14119009
TBR=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/14518008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196754 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.cc | 36 |
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 b083552..a1d07fc 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(); @@ -297,7 +265,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(); @@ -311,9 +278,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_, |