diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 23:30:51 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 23:30:51 +0000 |
| commit | 8439af1d26c1c3c29cc75995ba643161c15b4763 (patch) | |
| tree | 4e26350ce2449d7971c379443cd86fb919999533 /gpu/command_buffer/service/memory_program_cache_unittest.cc | |
| parent | 0dc1febed4347e32e38cf8cdbeeb7f1fbfe3f831 (diff) | |
| download | chromium_src-8439af1d26c1c3c29cc75995ba643161c15b4763.zip chromium_src-8439af1d26c1c3c29cc75995ba643161c15b4763.tar.gz chromium_src-8439af1d26c1c3c29cc75995ba643161c15b4763.tar.bz2 | |
Remove CompileStatusMap in gpu command buffer
BUG=269124
TEST=gpu_unittests
R=apatrick@chromium.org
Review URL: https://codereview.chromium.org/22320015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216308 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 | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/gpu/command_buffer/service/memory_program_cache_unittest.cc b/gpu/command_buffer/service/memory_program_cache_unittest.cc index 603c21e..83fc12a 100644 --- a/gpu/command_buffer/service/memory_program_cache_unittest.cc +++ b/gpu/command_buffer/service/memory_program_cache_unittest.cc @@ -124,8 +124,6 @@ class MemoryProgramCacheTest : public testing::Test { vertex_shader_->UpdateSource("bbbalsldkdkdkd"); fragment_shader_->UpdateSource("bbbal sldkdkdkas 134 ad"); - vertex_shader_->FlagSourceAsCompiled(true); - fragment_shader_->FlagSourceAsCompiled(true); vertex_shader_->SetStatus(true, NULL, NULL); fragment_shader_->SetStatus(true, NULL, NULL); @@ -202,9 +200,9 @@ TEST_F(MemoryProgramCacheTest, CacheSave) { base::Unretained(this))); EXPECT_EQ(ProgramCache::LINK_SUCCEEDED, cache_->GetLinkedProgramStatus( - *vertex_shader_->deferred_compilation_source(), + *vertex_shader_->signature_source(), NULL, - *fragment_shader_->deferred_compilation_source(), + *fragment_shader_->signature_source(), NULL, NULL)); EXPECT_EQ(1, shader_cache_count()); @@ -227,9 +225,9 @@ TEST_F(MemoryProgramCacheTest, LoadProgram) { base::Unretained(this))); EXPECT_EQ(ProgramCache::LINK_SUCCEEDED, cache_->GetLinkedProgramStatus( - *vertex_shader_->deferred_compilation_source(), + *vertex_shader_->signature_source(), NULL, - *fragment_shader_->deferred_compilation_source(), + *fragment_shader_->signature_source(), NULL, NULL)); EXPECT_EQ(1, shader_cache_count()); @@ -238,9 +236,9 @@ TEST_F(MemoryProgramCacheTest, LoadProgram) { cache_->LoadProgram(shader_cache_shader()); EXPECT_EQ(ProgramCache::LINK_SUCCEEDED, cache_->GetLinkedProgramStatus( - *vertex_shader_->deferred_compilation_source(), + *vertex_shader_->signature_source(), NULL, - *fragment_shader_->deferred_compilation_source(), + *fragment_shader_->signature_source(), NULL, NULL)); } @@ -391,9 +389,9 @@ TEST_F(MemoryProgramCacheTest, LoadFailOnDifferentSource) { base::Unretained(this))); const std::string vertex_orig_source = - *vertex_shader_->deferred_compilation_source(); + *vertex_shader_->signature_source(); vertex_shader_->UpdateSource("different!"); - vertex_shader_->FlagSourceAsCompiled(true); + vertex_shader_->SetStatus(true, NULL, NULL); EXPECT_EQ(ProgramCache::PROGRAM_LOAD_FAILURE, cache_->LoadLinkedProgram( kProgramId, vertex_shader_, @@ -405,9 +403,9 @@ TEST_F(MemoryProgramCacheTest, LoadFailOnDifferentSource) { base::Unretained(this)))); vertex_shader_->UpdateSource(vertex_orig_source.c_str()); - vertex_shader_->FlagSourceAsCompiled(true); + vertex_shader_->SetStatus(true, NULL, NULL); fragment_shader_->UpdateSource("different!"); - fragment_shader_->FlagSourceAsCompiled(true); + fragment_shader_->SetStatus(true, NULL, NULL); EXPECT_EQ(ProgramCache::PROGRAM_LOAD_FAILURE, cache_->LoadLinkedProgram( kProgramId, vertex_shader_, @@ -485,9 +483,9 @@ TEST_F(MemoryProgramCacheTest, MemoryProgramCacheEviction) { // save old source and modify for new program const std::string old_source = - *fragment_shader_->deferred_compilation_source(); + *fragment_shader_->signature_source(); fragment_shader_->UpdateSource("al sdfkjdk"); - fragment_shader_->FlagSourceAsCompiled(true); + fragment_shader_->SetStatus(true, NULL, NULL); scoped_ptr<char[]> bigTestBinary = scoped_ptr<char[]>(new char[kEvictingBinaryLength]); @@ -509,15 +507,15 @@ TEST_F(MemoryProgramCacheTest, MemoryProgramCacheEviction) { base::Unretained(this))); EXPECT_EQ(ProgramCache::LINK_SUCCEEDED, cache_->GetLinkedProgramStatus( - *vertex_shader_->deferred_compilation_source(), + *vertex_shader_->signature_source(), NULL, - *fragment_shader_->deferred_compilation_source(), + *fragment_shader_->signature_source(), NULL, NULL)); EXPECT_EQ(ProgramCache::LINK_UNKNOWN, cache_->GetLinkedProgramStatus( old_source, NULL, - *fragment_shader_->deferred_compilation_source(), + *fragment_shader_->signature_source(), NULL, NULL)); } @@ -540,9 +538,9 @@ TEST_F(MemoryProgramCacheTest, SaveCorrectProgram) { base::Unretained(this))); EXPECT_EQ(ProgramCache::LINK_SUCCEEDED, cache_->GetLinkedProgramStatus( - *vertex_shader_->deferred_compilation_source(), + *vertex_shader_->signature_source(), NULL, - *fragment_shader_->deferred_compilation_source(), + *fragment_shader_->signature_source(), NULL, NULL)); } @@ -564,9 +562,9 @@ TEST_F(MemoryProgramCacheTest, LoadCorrectProgram) { base::Unretained(this))); EXPECT_EQ(ProgramCache::LINK_SUCCEEDED, cache_->GetLinkedProgramStatus( - *vertex_shader_->deferred_compilation_source(), + *vertex_shader_->signature_source(), NULL, - *fragment_shader_->deferred_compilation_source(), + *fragment_shader_->signature_source(), NULL, NULL)); |