| Index: gpu/command_buffer/service/program_manager.h
|
| diff --git a/gpu/command_buffer/service/program_manager.h b/gpu/command_buffer/service/program_manager.h
|
| index 553c31335115049ea9257d812e813b6876f79b7b..d2655cc97ae2345e5806984389c24af88d1d96c4 100644
|
| --- a/gpu/command_buffer/service/program_manager.h
|
| +++ b/gpu/command_buffer/service/program_manager.h
|
| @@ -173,11 +173,6 @@ class GPU_EXPORT ProgramManager {
|
| // 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;
|
| @@ -322,9 +317,6 @@ class GPU_EXPORT ProgramManager {
|
| // 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);
|
| @@ -334,8 +326,6 @@ class GPU_EXPORT ProgramManager {
|
| 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_;
|
|
|