Add driver bug workaround for SH_INIT_GL_POSITION.

BUG=286468
TEST=webgl conformance tests (1.0.3), gpu_unittests

Review URL: https://chromiumcodereview.appspot.com/23441050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221895 0039d316-1c4b-4281-b951-d872f2087c98

gpu/command_buffer/service/gles2_cmd_decoder.cc

@@ -2509,15 +2509,18 @@ bool GLES2DecoderImpl::InitializeShaderTranslator() {
   ShaderTranslatorInterface::GlslImplementationType implementation_type =
       gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2 ?
           ShaderTranslatorInterface::kGlslES : ShaderTranslatorInterface::kGlsl;
-  ShaderTranslatorInterface::GlslBuiltInFunctionBehavior function_behavior =
-      workarounds().needs_glsl_built_in_function_emulation ?
-          ShaderTranslatorInterface::kGlslBuiltInFunctionEmulated :
-          ShaderTranslatorInterface::kGlslBuiltInFunctionOriginal;
+  int driver_bug_workarounds = 0;
+  if (workarounds().needs_glsl_built_in_function_emulation)
+    driver_bug_workarounds |= SH_EMULATE_BUILT_IN_FUNCTIONS;
+  // TODO(zmo): Uncomment the below two lines when ANGLE CL is rolled in.
+  // if (workarounds().init_gl_position_in_vertex_shader)
+  //   driver_bug_workarounds |= SH_INIT_GL_POSITION;
 
   ShaderTranslatorCache* cache = ShaderTranslatorCache::GetInstance();
   vertex_translator_ = cache->GetTranslator(
       SH_VERTEX_SHADER, shader_spec, &resources,
-      implementation_type, function_behavior);
+      implementation_type,
+      static_cast<ShCompileOptions>(driver_bug_workarounds));
   if (!vertex_translator_.get()) {
     LOG(ERROR) << "Could not initialize vertex shader translator.";
     Destroy(true);
@@ -2526,7 +2529,8 @@ bool GLES2DecoderImpl::InitializeShaderTranslator() {
 
   fragment_translator_ = cache->GetTranslator(
       SH_FRAGMENT_SHADER, shader_spec, &resources,
-      implementation_type, function_behavior);
+      implementation_type,
+      static_cast<ShCompileOptions>(driver_bug_workarounds));
   if (!fragment_translator_.get()) {
     LOG(ERROR) << "Could not initialize fragment shader translator.";
     Destroy(true);

gpu/command_buffer/service/mocks.h

@@ -84,7 +84,7 @@ class MockShaderTranslator : public ShaderTranslatorInterface {
       ShShaderSpec shader_spec,
       const ShBuiltInResources* resources,
       GlslImplementationType glsl_implementation_type,
-      GlslBuiltInFunctionBehavior glsl_built_in_function_behavior));
+      ShCompileOptions driver_bug_workarounds));
   MOCK_METHOD1(Translate, bool(const char* shader));
   MOCK_CONST_METHOD0(translated_shader, const char*());
   MOCK_CONST_METHOD0(info_log, const char*());

gpu/command_buffer/service/shader_translator.cc

@@ -118,7 +118,7 @@ ShaderTranslator::DestructionObserver::~DestructionObserver() {
 ShaderTranslator::ShaderTranslator()
     : compiler_(NULL),
       implementation_is_glsl_es_(false),
-      needs_built_in_function_emulation_(false) {
+      driver_bug_workarounds_(static_cast<ShCompileOptions>(0)) {
 }
 
 bool ShaderTranslator::Init(
@@ -126,8 +126,7 @@ bool ShaderTranslator::Init(
     ShShaderSpec shader_spec,
     const ShBuiltInResources* resources,
     ShaderTranslatorInterface::GlslImplementationType glsl_implementation_type,
-    ShaderTranslatorInterface::GlslBuiltInFunctionBehavior
-        glsl_built_in_function_behavior) {
+    ShCompileOptions driver_bug_workarounds) {
   // Make sure Init is called only once.
   DCHECK(compiler_ == NULL);
   DCHECK(shader_type == SH_FRAGMENT_SHADER || shader_type == SH_VERTEX_SHADER);
@@ -147,8 +146,7 @@ bool ShaderTranslator::Init(
   }
   compiler_options_ = *resources;
   implementation_is_glsl_es_ = (glsl_implementation_type == kGlslES);
-  needs_built_in_function_emulation_ =
-      (glsl_built_in_function_behavior == kGlslBuiltInFunctionEmulated);
+  driver_bug_workarounds_ = driver_bug_workarounds;
   return compiler_ != NULL;
 }
 
@@ -160,8 +158,7 @@ int ShaderTranslator::GetCompileOptions() const {
 
   compile_options |= SH_CLAMP_INDIRECT_ARRAY_BOUNDS;
 
-  if (needs_built_in_function_emulation_)
-    compile_options |= SH_EMULATE_BUILT_IN_FUNCTIONS;
+  compile_options |= driver_bug_workarounds_;
 
   return compile_options;
 }

gpu/command_buffer/service/shader_translator.h

@@ -27,11 +27,6 @@ class ShaderTranslatorInterface {
     kGlslES
   };
 
-  enum GlslBuiltInFunctionBehavior {
-    kGlslBuiltInFunctionOriginal,
-    kGlslBuiltInFunctionEmulated
-  };
-
   struct VariableInfo {
     VariableInfo()
         : type(0),
@@ -75,7 +70,7 @@ class ShaderTranslatorInterface {
       ShShaderSpec shader_spec,
       const ShBuiltInResources* resources,
       GlslImplementationType glsl_implementation_type,
-      GlslBuiltInFunctionBehavior glsl_built_in_function_behavior) = 0;
+      ShCompileOptions driver_bug_workarounds) = 0;
 
   // Translates the given shader source.
   // Returns true if translation is successful, false otherwise.
@@ -125,7 +120,7 @@ class GPU_EXPORT ShaderTranslator
       ShShaderSpec shader_spec,
       const ShBuiltInResources* resources,
       GlslImplementationType glsl_implementation_type,
-      GlslBuiltInFunctionBehavior glsl_built_in_function_behavior) OVERRIDE;
+      ShCompileOptions driver_bug_workarounds) OVERRIDE;
 
   // Overridden from ShaderTranslatorInterface.
   virtual bool Translate(const char* shader) OVERRIDE;
@@ -162,7 +157,7 @@ class GPU_EXPORT ShaderTranslator
   VariableMap varying_map_;
   NameMap name_map_;
   bool implementation_is_glsl_es_;
-  bool needs_built_in_function_emulation_;
+  ShCompileOptions driver_bug_workarounds_;
   ObserverList<DestructionObserver> destruction_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ShaderTranslator);

gpu/command_buffer/service/shader_translator_cache.cc

@@ -34,13 +34,12 @@ scoped_refptr<ShaderTranslator> ShaderTranslatorCache::GetTranslator(
     const ShBuiltInResources* resources,
     ShaderTranslatorInterface::GlslImplementationType
         glsl_implementation_type,
-    ShaderTranslatorInterface::GlslBuiltInFunctionBehavior
-        glsl_built_in_function_behavior) {
+    ShCompileOptions driver_bug_workarounds) {
   ShaderTranslatorInitParams params(shader_type,
                                     shader_spec,
                                     *resources,
                                     glsl_implementation_type,
-                                    glsl_built_in_function_behavior);
+                                    driver_bug_workarounds);
 
   Cache::iterator it = cache_.find(params);
   if (it != cache_.end())
@@ -49,7 +48,7 @@ scoped_refptr<ShaderTranslator> ShaderTranslatorCache::GetTranslator(
   ShaderTranslator* translator = new ShaderTranslator();
   if (translator->Init(shader_type, shader_spec, resources,
                        glsl_implementation_type,
-                       glsl_built_in_function_behavior)) {
+                       driver_bug_workarounds)) {
     cache_[params] = translator;
     translator->AddDestructionObserver(this);
     return translator;

gpu/command_buffer/service/shader_translator_cache.h

@@ -36,8 +36,7 @@ class ShaderTranslatorCache : public ShaderTranslator::DestructionObserver {
       const ShBuiltInResources* resources,
       ShaderTranslatorInterface::GlslImplementationType
           glsl_implementation_type,
-      ShaderTranslatorInterface::GlslBuiltInFunctionBehavior
-          glsl_built_in_function_behavior);
+      ShCompileOptions driver_bug_workarounds);
 
  private:
   ShaderTranslatorCache();
@@ -52,8 +51,7 @@ class ShaderTranslatorCache : public ShaderTranslator::DestructionObserver {
     ShBuiltInResources resources;
     ShaderTranslatorInterface::GlslImplementationType
         glsl_implementation_type;
-    ShaderTranslatorInterface::GlslBuiltInFunctionBehavior
-        glsl_built_in_function_behavior;
+    ShCompileOptions driver_bug_workarounds;
 
     ShaderTranslatorInitParams(
         ShShaderType shader_type,
@@ -61,13 +59,12 @@ class ShaderTranslatorCache : public ShaderTranslator::DestructionObserver {
         const ShBuiltInResources& resources,
         ShaderTranslatorInterface::GlslImplementationType
             glsl_implementation_type,
-        ShaderTranslatorInterface::GlslBuiltInFunctionBehavior
-            glsl_built_in_function_behavior)
+        ShCompileOptions driver_bug_workarounds)
       : shader_type(shader_type),
         shader_spec(shader_spec),
         resources(resources),
         glsl_implementation_type(glsl_implementation_type),
-        glsl_built_in_function_behavior(glsl_built_in_function_behavior) {
+        driver_bug_workarounds(driver_bug_workarounds) {
     }
 
     ShaderTranslatorInitParams(const ShaderTranslatorInitParams& params) {

gpu/command_buffer/service/shader_translator_unittest.cc

@@ -28,11 +28,11 @@ class ShaderTranslatorTest : public testing::Test {
     ASSERT_TRUE(vertex_translator_->Init(
         SH_VERTEX_SHADER, SH_GLES2_SPEC, &resources,
         ShaderTranslatorInterface::kGlsl,
-        ShaderTranslatorInterface::kGlslBuiltInFunctionEmulated));
+        SH_EMULATE_BUILT_IN_FUNCTIONS));
     ASSERT_TRUE(fragment_translator_->Init(
         SH_FRAGMENT_SHADER, SH_GLES2_SPEC, &resources,
         ShaderTranslatorInterface::kGlsl,
-        ShaderTranslatorInterface::kGlslBuiltInFunctionOriginal));
+        static_cast<ShCompileOptions>(0)));
     // Post-init the results must be empty.
     // Vertex translator results.
     EXPECT_TRUE(vertex_translator_->translated_shader() == NULL);
@@ -232,16 +232,16 @@ TEST_F(ShaderTranslatorTest, OptionsString) {
   ASSERT_TRUE(translator_1->Init(
       SH_VERTEX_SHADER, SH_GLES2_SPEC, &resources,
       ShaderTranslatorInterface::kGlsl,
-      ShaderTranslatorInterface::kGlslBuiltInFunctionEmulated));
+      SH_EMULATE_BUILT_IN_FUNCTIONS));
   ASSERT_TRUE(translator_2->Init(
       SH_FRAGMENT_SHADER, SH_GLES2_SPEC, &resources,
       ShaderTranslatorInterface::kGlsl,
-      ShaderTranslatorInterface::kGlslBuiltInFunctionOriginal));
+      static_cast<ShCompileOptions>(0)));
   resources.EXT_draw_buffers = 1;
   ASSERT_TRUE(translator_3->Init(
       SH_VERTEX_SHADER, SH_GLES2_SPEC, &resources,
       ShaderTranslatorInterface::kGlsl,
-      ShaderTranslatorInterface::kGlslBuiltInFunctionEmulated));
+      SH_EMULATE_BUILT_IN_FUNCTIONS));
 
   std::string options_1(
       translator_1->GetStringForOptionsThatWouldEffectCompilation());

gpu/config/gpu_driver_bug_list_json.cc

@@ -85,7 +85,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
 {
   "name": "gpu driver bug list",
   // Please update the version number whenever you change this file.
-  "version": "2.9",
+  "version": "2.10",
   "entries": [
     {
       "id": 1,
@@ -563,6 +563,18 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
       "features": [
         "use_virtualized_gl_contexts"
       ]
+    },
+    {
+      "id": 37,
+      "cr_bugs": [286468],
+      "description": "Program link fails in NVIDIA Linux if gl_Position is not set",
+      "os": {
+        "type": "linux"
+      },
+      "vendor_id": "0x10de",
+      "features": [
+        "init_gl_position_in_vertex_shader"
+      ]
     }
   ]
 }

gpu/config/gpu_driver_bug_workaround_type.h

@@ -18,18 +18,28 @@
          delete_instead_of_resize_fbo)                       \
   GPU_OP(DISABLE_ANGLE_FRAMEBUFFER_MULTISAMPLE,              \
          disable_angle_framebuffer_multisample)              \
+  GPU_OP(DISABLE_ANGLE_INSTANCED_ARRAYS,                     \
+         disable_angle_instanced_arrays)                     \
+  GPU_OP(DISABLE_ASYNC_READPIXELS,                           \
+         disable_async_readpixels)                           \
+  GPU_OP(DISABLE_D3D11,                                      \
+         disable_d3d11)                                      \
   GPU_OP(DISABLE_DEPTH_TEXTURE,                              \
          disable_depth_texture)                              \
   GPU_OP(DISABLE_EXT_DRAW_BUFFERS,                           \
          disable_ext_draw_buffers)                           \
   GPU_OP(DISABLE_EXT_OCCLUSION_QUERY,                        \
          disable_ext_occlusion_query)                        \
+  GPU_OP(DISABLE_MULTIMONITOR_MULTISAMPLING,                 \
+         disable_multimonitor_multisampling)                 \
   GPU_OP(DISABLE_OES_STANDARD_DERIVATIVES,                   \
          disable_oes_standard_derivatives)                   \
   GPU_OP(ENABLE_CHROMIUM_FAST_NPOT_MO8_TEXTURES,             \
          enable_chromium_fast_npot_mo8_textures)             \
   GPU_OP(EXIT_ON_CONTEXT_LOST,                               \
          exit_on_context_lost)                               \
+  GPU_OP(INIT_GL_POSITION_IN_VERTEX_SHADER,                  \
+         init_gl_position_in_vertex_shader)                  \
   GPU_OP(MAX_CUBE_MAP_TEXTURE_SIZE_LIMIT_1024,               \
          max_cube_map_texture_size_limit_1024)               \
   GPU_OP(MAX_CUBE_MAP_TEXTURE_SIZE_LIMIT_4096,               \
@@ -48,6 +58,8 @@
          reverse_point_sprite_coord_origin)                  \
   GPU_OP(SET_TEXTURE_FILTER_BEFORE_GENERATING_MIPMAP,        \
          set_texture_filter_before_generating_mipmap)        \
+  GPU_OP(SWIZZLE_RGBA_FOR_ASYNC_READPIXELS,                  \
+         swizzle_rgba_for_async_readpixels)                  \
   GPU_OP(UNBIND_FBO_ON_CONTEXT_SWITCH,                       \
          unbind_fbo_on_context_switch)                       \
   GPU_OP(USE_CLIENT_SIDE_ARRAYS_FOR_STREAM_BUFFERS,          \
@@ -56,16 +68,6 @@
          use_current_program_after_successful_link)          \
   GPU_OP(USE_NON_ZERO_SIZE_FOR_CLIENT_SIDE_STREAM_BUFFERS,   \
          use_non_zero_size_for_client_side_stream_buffers)   \
-  GPU_OP(DISABLE_ASYNC_READPIXELS,                           \
-         disable_async_readpixels)                           \
-  GPU_OP(DISABLE_D3D11,                                      \
-         disable_d3d11)                                      \
-  GPU_OP(SWIZZLE_RGBA_FOR_ASYNC_READPIXELS,                  \
-         swizzle_rgba_for_async_readpixels)                  \
-  GPU_OP(DISABLE_ANGLE_INSTANCED_ARRAYS,                     \
-         disable_angle_instanced_arrays)                     \
-  GPU_OP(DISABLE_MULTIMONITOR_MULTISAMPLING,                 \
-         disable_multimonitor_multisampling)                 \
   GPU_OP(USE_VIRTUALIZED_GL_CONTEXTS,                        \
          use_virtualized_gl_contexts)                        \