diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 20:10:45 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 20:10:45 +0000 |
commit | ddb1e5ae096bd91da721887fd55e68c603bf7067 (patch) | |
tree | 401d9a379ff03bb8b69a1ce9c23fe182f673f587 /gpu | |
parent | 1c9526e0650a91e412d815417634c9f193b1a4d5 (diff) | |
download | chromium_src-ddb1e5ae096bd91da721887fd55e68c603bf7067.zip chromium_src-ddb1e5ae096bd91da721887fd55e68c603bf7067.tar.gz chromium_src-ddb1e5ae096bd91da721887fd55e68c603bf7067.tar.bz2 |
Even more virtual method deinlining.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/5741001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 5 | ||||
-rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.h | 4 | ||||
-rw-r--r-- | gpu/command_buffer/service/shader_translator.cc | 18 | ||||
-rw-r--r-- | gpu/command_buffer/service/shader_translator.h | 9 |
4 files changed, 28 insertions, 8 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 73cc483..315731b 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -382,6 +382,11 @@ bool ContextCreationAttribParser::Parse(const std::vector<int32>& attribs) { // } // anonymous namespace. +bool GLES2Decoder::GetServiceTextureId(uint32 client_texture_id, + uint32* service_texture_id) { + return false; +} + GLES2Decoder::GLES2Decoder() : debug_(false) { } diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.h b/gpu/command_buffer/service/gles2_cmd_decoder.h index eddd7fe..195adb1 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder.h @@ -99,9 +99,7 @@ class GLES2Decoder : public CommonDecoder { // Get the service texture ID corresponding to a client texture ID. // If no such record is found then return false. virtual bool GetServiceTextureId(uint32 client_texture_id, - uint32* service_texture_id) { - return false; - } + uint32* service_texture_id); protected: GLES2Decoder(); diff --git a/gpu/command_buffer/service/shader_translator.cc b/gpu/command_buffer/service/shader_translator.cc index eb5b265..43b29ef 100644 --- a/gpu/command_buffer/service/shader_translator.cc +++ b/gpu/command_buffer/service/shader_translator.cc @@ -136,6 +136,24 @@ bool ShaderTranslator::Translate(const char* shader) { return success; } +const char* ShaderTranslator::translated_shader() const { + return translated_shader_.get(); +} + +const char* ShaderTranslator::info_log() const { + return info_log_.get(); +} + +const ShaderTranslatorInterface::VariableMap& +ShaderTranslator::attrib_map() const { + return attrib_map_; +} + +const ShaderTranslatorInterface::VariableMap& +ShaderTranslator::uniform_map() const { + return uniform_map_; +} + void ShaderTranslator::ClearResults() { translated_shader_.reset(); info_log_.reset(); diff --git a/gpu/command_buffer/service/shader_translator.h b/gpu/command_buffer/service/shader_translator.h index 084d1b8..9e834ea 100644 --- a/gpu/command_buffer/service/shader_translator.h +++ b/gpu/command_buffer/service/shader_translator.h @@ -75,13 +75,12 @@ class ShaderTranslator : public ShaderTranslatorInterface { virtual bool Translate(const char* shader); // Overridden from ShaderTranslatorInterface. - virtual const char* translated_shader() const { - return translated_shader_.get(); } - virtual const char* info_log() const { return info_log_.get(); } + virtual const char* translated_shader() const; + virtual const char* info_log() const; // Overridden from ShaderTranslatorInterface. - virtual const VariableMap& attrib_map() const { return attrib_map_; } - virtual const VariableMap& uniform_map() const { return uniform_map_; } + virtual const VariableMap& attrib_map() const; + virtual const VariableMap& uniform_map() const; private: void ClearResults(); |