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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 15 matching lines @@
 class ShaderManager;
 class ShaderTranslator;
 
 // This is used to track which attributes a particular program needs
 // so we can verify at glDrawXXX time that every attribute is either disabled
 // or if enabled that it points to a valid source.
 class GPU_EXPORT Program : public base::RefCounted<Program> {
  public:
   static const int kMaxAttachedShaders = 2;
 
+  enum VaryingsPackingOption {
+    kCountOnlyStaticallyUsed,
+    kCountAll
+  };
+
   struct UniformInfo {
     UniformInfo();
     UniformInfo(
         GLsizei _size, GLenum _type, GLint _fake_location_base,
         const std::string& _name);
     ~UniformInfo();
 
     bool IsValid() const {
       return size != 0;
     }
@@ skipping 103 matching lines @@
 
   bool AttachShader(ShaderManager* manager, Shader* shader);
   bool DetachShader(ShaderManager* manager, Shader* shader);
 
   bool CanLink() const;
 
   // Performs glLinkProgram and related activities.
   bool Link(ShaderManager* manager,
             ShaderTranslator* vertex_translator,
             ShaderTranslator* fragment_shader,
+            VaryingsPackingOption varyings_packing_option,
             const ShaderCacheCallback& shader_callback);
 
   // Performs glValidateProgram and related activities.
   void Validate();
 
   const std::string* log_info() const {
     return log_info_.get();
   }
 
   bool InUse() const {
@@ skipping 22 matching lines @@
 
   // Return true if a varying is statically used in fragment shader, but it
   // is not declared in vertex shader.
   bool DetectVaryingsMismatch() const;
 
   // Return true if an uniform and an attribute share the same name.
   bool DetectGlobalNameConflicts() const;
 
   // 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 {
     return bind_attrib_location_map_;
   }
 
  private:
   friend class base::RefCounted<Program>;
   friend class ProgramManager;
 
@@ skipping 202 matching lines @@
 
   uint32 max_varying_vectors_;
 
   DISALLOW_COPY_AND_ASSIGN(ProgramManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_