Exposed support for dynamically enabling extensions in command buffer...

gpu/command_buffer/service/shader_translator.cc

Index: gpu/command_buffer/service/shader_translator.cc
===================================================================
--- gpu/command_buffer/service/shader_translator.cc	(revision 68245)
+++ gpu/command_buffer/service/shader_translator.cc	(working copy)
@@ -4,6 +4,8 @@
 
 #include "gpu/command_buffer/service/shader_translator.h"
 
+#include <string.h>
+
 #include "base/at_exit.h"
 #include "base/logging.h"
 
@@ -62,7 +64,9 @@
 namespace gpu {
 namespace gles2 {
 
-ShaderTranslator::ShaderTranslator() : compiler_(NULL) {
+ShaderTranslator::ShaderTranslator()
+    : compiler_(NULL),
+      implementation_is_glsl_es_(false) {
 }
 
 ShaderTranslator::~ShaderTranslator() {
@@ -72,7 +76,8 @@
 
 bool ShaderTranslator::Init(ShShaderType shader_type,
                             ShShaderSpec shader_spec,
-                            const ShBuiltInResources* resources) {
+                            const ShBuiltInResources* resources,
+                            bool implementation_is_glsl_es) {
   // Make sure Init is called only once.
   DCHECK(compiler_ == NULL);
   DCHECK(shader_type == SH_FRAGMENT_SHADER || shader_type == SH_VERTEX_SHADER);
@@ -83,6 +88,7 @@
     return false;
 
   compiler_ = ShConstructCompiler(shader_type, shader_spec, resources);
+  implementation_is_glsl_es_ = implementation_is_glsl_es;
   return compiler_ != NULL;
 }
 
@@ -96,12 +102,22 @@
   int compile_options = SH_OBJECT_CODE | SH_ATTRIBUTES_UNIFORMS;
   if (ShCompile(compiler_, &shader, 1, compile_options)) {
     success = true;
-    // Get translated shader.
-    int obj_code_len = 0;
-    ShGetInfo(compiler_, SH_OBJECT_CODE_LENGTH, &obj_code_len);
-    if (obj_code_len > 1) {
-      translated_shader_.reset(new char[obj_code_len]);
-      ShGetObjectCode(compiler_, translated_shader_.get());
+    if (!implementation_is_glsl_es_) {
+      // Get translated shader.
+      int obj_code_len = 0;
+      ShGetInfo(compiler_, SH_OBJECT_CODE_LENGTH, &obj_code_len);
+      if (obj_code_len > 1) {
+        translated_shader_.reset(new char[obj_code_len]);
+        ShGetObjectCode(compiler_, translated_shader_.get());
+      }
+    } else {
+      // Pass down the original shader's source rather than the

[greggman, 2010/12/04 01:28:44]

If you pass it down untranslated it will not have any of the re-writes needed to
fix bugs or add WebGL features. Shouldn't this stay as it was?

[Ken Russell (switch to Gerrit), 2010/12/04 02:17:46]

Previously we weren't using the shader validator at all on OpenGL ES 2.0
implementations. The shader validator doesn't have a GLSL ES backend, only a
desktop GL backend, and the two aren't compatible. I've filed
http://code.google.com/p/angleproject/issues/detail?id=81 to track this and
added a TODO.

+      // compiler's output.
+      int shader_code_len = 1 + strlen(shader);
+      if (shader_code_len > 1) {
+        translated_shader_.reset(new char[shader_code_len]);
+        strncpy(translated_shader_.get(), shader, shader_code_len);
+      }
     }
     // Get info for attribs and uniforms.
     GetVariableInfo(compiler_, SH_ACTIVE_ATTRIBUTES, &attrib_map_);