summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/program_manager.h
diff options
context:
space:
mode:
authorzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-04 00:18:08 +0000
committerzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-04 00:18:08 +0000
commit5b6f52fae391c57efaedc0d4a359466760247d10 (patch)
tree3b2e81e1dee71605e722104ff6821522eb311b73 /gpu/command_buffer/service/program_manager.h
parent9400c64565586091f67d4131850fd0836b18b511 (diff)
downloadchromium_src-5b6f52fae391c57efaedc0d4a359466760247d10.zip
chromium_src-5b6f52fae391c57efaedc0d4a359466760247d10.tar.gz
chromium_src-5b6f52fae391c57efaedc0d4a359466760247d10.tar.bz2
Hook up shader long variable name mapping with GPU command buffer port.
shader long variable name mapping is implemented in Angle shader translator. We should hook up the feature with GPU command buffer so long names won't cause shader compile/link failure or crashes. BUG=84753 TEST=tree green, webgl's conformance/glsl-conformance.html and conformance/glsl-long-variable-names pass on all platforms (Mac/Win/Linux), gles2 conformance test suites run ok. Review URL: http://codereview.chromium.org/6969100 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/program_manager.h')
-rw-r--r--gpu/command_buffer/service/program_manager.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/program_manager.h b/gpu/command_buffer/service/program_manager.h
index 4344a88..a584177 100644
--- a/gpu/command_buffer/service/program_manager.h
+++ b/gpu/command_buffer/service/program_manager.h
@@ -196,11 +196,12 @@ class ProgramManager {
void UpdateLogInfo();
const UniformInfo* AddUniformInfo(
- GLsizei size, GLenum type, GLint location, const std::string& name);
+ GLsizei size, GLenum type, GLint location, const std::string& name,
+ const std::string& original_name);
void GetCorrectedVariableInfo(
bool use_uniforms, const std::string& name, std::string* corrected_name,
- GLsizei* size, GLenum* type) const;
+ std::string* original_name, GLsizei* size, GLenum* type) const;
void DetachShaders(ShaderManager* manager);