Merge r249547 into M33: Add a gpu driver bug workaround to count in all varyings in packing check.

gpu/command_buffer/service/program_manager.h

Index: gpu/command_buffer/service/program_manager.h
===================================================================
--- gpu/command_buffer/service/program_manager.h	(revision 250202)
+++ gpu/command_buffer/service/program_manager.h	(working copy)
@@ -33,6 +33,11 @@
  public:
   static const int kMaxAttachedShaders = 2;
 
+  enum VaryingsPackingOption {
+    kCountOnlyStaticallyUsed,
+    kCountAll
+  };
+
   struct UniformInfo {
     UniformInfo();
     UniformInfo(
@@ -156,6 +161,7 @@
   bool Link(ShaderManager* manager,
             ShaderTranslator* vertex_translator,
             ShaderTranslator* fragment_shader,
+            VaryingsPackingOption varyings_packing_option,
             const ShaderCacheCallback& shader_callback);
 
   // Performs glValidateProgram and related activities.
@@ -198,7 +204,7 @@
 
   // Return false if varyings can't be packed into the max available
   // varying registers.
-  bool CheckVaryingsPacking() const;
+  bool CheckVaryingsPacking(VaryingsPackingOption option) const;
 
   // Visible for testing
   const LocationMap& bind_attrib_location_map() const {