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/program_cache.h | |
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/program_cache.h')
-rw-r--r-- | gpu/command_buffer/service/program_cache.h | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/gpu/command_buffer/service/program_cache.h b/gpu/command_buffer/service/program_cache.h index a8b9f91..3fb5687 100644 --- a/gpu/command_buffer/service/program_cache.h +++ b/gpu/command_buffer/service/program_cache.h @@ -27,11 +27,6 @@ class GPU_EXPORT ProgramCache { typedef std::map<std::string, GLint> LocationMap; - enum CompiledShaderStatus { - COMPILATION_UNKNOWN, - COMPILATION_SUCCEEDED - }; - enum LinkedProgramStatus { LINK_UNKNOWN, LINK_SUCCEEDED @@ -45,13 +40,6 @@ class GPU_EXPORT ProgramCache { ProgramCache(); virtual ~ProgramCache(); - CompiledShaderStatus GetShaderCompilationStatus( - const std::string& shader_src, - const ShaderTranslatorInterface* translator) const; - void ShaderCompilationSucceeded(const std::string& shader_src, - const ShaderTranslatorInterface* translator); - void ShaderCompilationSucceededSha(const std::string& sha_string); - LinkedProgramStatus GetLinkedProgramStatus( const std::string& untranslated_shader_a, const ShaderTranslatorInterface* translator_a, @@ -95,9 +83,7 @@ class GPU_EXPORT ProgramCache { protected: // called by implementing class after a shader was successfully cached - void LinkedProgramCacheSuccess(const std::string& program_hash, - const std::string& shader_a_hash, - const std::string& shader_b_hash); + void LinkedProgramCacheSuccess(const std::string& program_hash); // result is not null terminated void ComputeShaderHash(const std::string& shader, @@ -112,30 +98,15 @@ class GPU_EXPORT ProgramCache { const LocationMap* bind_attrib_location_map, char* result) const; - void Evict(const std::string& program_hash, - const std::string& shader_0_hash, - const std::string& shader_1_hash); + void Evict(const std::string& program_hash); private: - struct CompiledShaderInfo { - CompiledShaderInfo() : status(COMPILATION_UNKNOWN), ref_count(0) { } - explicit CompiledShaderInfo(CompiledShaderStatus status_) - : status(status_), - ref_count(0) { } - - CompiledShaderStatus status; - size_t ref_count; - }; - - typedef base::hash_map<std::string, - CompiledShaderInfo> CompileStatusMap; typedef base::hash_map<std::string, LinkedProgramStatus> LinkStatusMap; // called to clear the backend cache virtual void ClearBackend() = 0; - CompileStatusMap shader_status_; LinkStatusMap link_status_; DISALLOW_COPY_AND_ASSIGN(ProgramCache); |