summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/shader_translator.h
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 21:38:27 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 21:38:27 +0000
commitbc51875961a1e943f224a4c5e46da106b39f1c46 (patch)
tree7f21e0f624a38dda99e087000e325d1a07273784 /gpu/command_buffer/service/shader_translator.h
parent987c09d491df35db519eb3f5dc398d51b179f7d5 (diff)
downloadchromium_src-bc51875961a1e943f224a4c5e46da106b39f1c46.zip
chromium_src-bc51875961a1e943f224a4c5e46da106b39f1c46.tar.gz
chromium_src-bc51875961a1e943f224a4c5e46da106b39f1c46.tar.bz2
Changes WebGL to rely on the command buffer
for more validation. This change also means that the shader compiler is put into WebGL mode for WebGL. TEST=ran webgl conformance tests. BUG=none Review URL: http://codereview.chromium.org/3890004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63267 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/shader_translator.h')
-rw-r--r--gpu/command_buffer/service/shader_translator.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/shader_translator.h b/gpu/command_buffer/service/shader_translator.h
index e2e0620..5054972 100644
--- a/gpu/command_buffer/service/shader_translator.h
+++ b/gpu/command_buffer/service/shader_translator.h
@@ -23,7 +23,9 @@ class ShaderTranslator {
// Initializes the translator.
// Must be called once before using the translator object.
- bool Init(ShShaderType shader_type, const ShBuiltInResources* resources);
+ bool Init(ShShaderType shader_type,
+ ShShaderSpec shader_spec,
+ const ShBuiltInResources* resources);
// Translates the given shader source.
// Returns true if translation is successful, false otherwise.
bool Translate(const char* shader);
@@ -46,13 +48,14 @@ class ShaderTranslator {
private:
void ClearResults();
- DISALLOW_COPY_AND_ASSIGN(ShaderTranslator);
ShHandle compiler_;
scoped_array<char> translated_shader_;
scoped_array<char> info_log_;
VariableMap attrib_map_;
VariableMap uniform_map_;
+
+ DISALLOW_COPY_AND_ASSIGN(ShaderTranslator);
};
} // namespace gles2