Add support for GL_CHROMIUM_consistent_uniform_locations

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 155 matching lines @@
     void SetAttribLocationBinding(const std::string& attrib,
                                   GLint location) {
       bind_attrib_location_map_[attrib] = location;
     }
 
     // Detects if there are attribute location conflicts from
     // glBindAttribLocation() calls.
     // We only consider the declared attributes in the program.
     bool DetectAttribLocationBindingConflicts() const;
 
-    static inline GLint GetFakeLocation(
-        GLint fake_base_location, GLint element_index) {
-      return fake_base_location | element_index << 16;
-    }
-
    private:
     friend class base::RefCounted<ProgramInfo>;
     friend class ProgramManager;
 
     ~ProgramInfo();
 
     void set_log_info(const char* str) {
       log_info_.reset(str ? new std::string(str) : NULL);
     }
 
@@ skipping 124 matching lines @@
 
   // Clears the uniforms for this program.
   void ClearUniforms(ProgramInfo* info);
 
   // Returns true if prefix is invalid for gl.
   static bool IsInvalidPrefix(const char* name, size_t length);
 
   // Check if a ProgramInfo is owned by this ProgramManager.
   bool IsOwned(ProgramInfo* info);
 
-  GLint SwizzleLocation(GLint unswizzled_location) const;
-  GLint UnswizzleLocation(GLint swizzled_location) const;
-
  private:
   void StartTracking(ProgramInfo* info);
   void StopTracking(ProgramInfo* info);
 
   // Info for each "successfully linked" program by service side program Id.
   // TODO(gman): Choose a faster container.
   typedef std::map<GLuint, ProgramInfo::Ref> ProgramInfoMap;
   ProgramInfoMap program_infos_;
 
-  int uniform_swizzle_;
-
   // Counts the number of ProgramInfo allocated with 'this' as its manager.
   // Allows to check no ProgramInfo will outlive this.
   unsigned int program_info_count_;
 
   bool have_context_;
 
   bool disable_workarounds_;
 
   // Used to clear uniforms.
   std::vector<uint8> zero_;
 
   void RemoveProgramInfoIfUnused(
       ShaderManager* shader_manager, ProgramInfo* info);
 
   DISALLOW_COPY_AND_ASSIGN(ProgramManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_