| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ | 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ |
| 6 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ | 6 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 const std::string& _name) | 79 const std::string& _name) |
| 80 : color_name(_color_name), index(_index), name(_name) {} | 80 : color_name(_color_name), index(_index), name(_name) {} |
| 81 ProgramOutputInfo() : color_name(0), index(0) {} | 81 ProgramOutputInfo() : color_name(0), index(0) {} |
| 82 GLuint color_name; | 82 GLuint color_name; |
| 83 GLuint index; | 83 GLuint index; |
| 84 std::string name; | 84 std::string name; |
| 85 }; | 85 }; |
| 86 | 86 |
| 87 struct UniformInfo { | 87 struct UniformInfo { |
| 88 UniformInfo(); | 88 UniformInfo(); |
| 89 UniformInfo(const UniformInfo& other); |
| 89 UniformInfo(const std::string& client_name, | 90 UniformInfo(const std::string& client_name, |
| 90 GLint client_location_base, | 91 GLint client_location_base, |
| 91 GLenum _type, | 92 GLenum _type, |
| 92 bool _is_array, | 93 bool _is_array, |
| 93 const std::vector<GLint>& service_locations); | 94 const std::vector<GLint>& service_locations); |
| 94 ~UniformInfo(); | 95 ~UniformInfo(); |
| 95 bool IsSampler() const { | 96 bool IsSampler() const { |
| 96 return type == GL_SAMPLER_2D || type == GL_SAMPLER_2D_RECT_ARB || | 97 return type == GL_SAMPLER_2D || type == GL_SAMPLER_2D_RECT_ARB || |
| 97 type == GL_SAMPLER_CUBE || type == GL_SAMPLER_EXTERNAL_OES; | 98 type == GL_SAMPLER_CUBE || type == GL_SAMPLER_EXTERNAL_OES; |
| 98 } | 99 } |
| (...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 624 }; | 625 }; |
| 625 | 626 |
| 626 inline const FeatureInfo& Program::feature_info() const { | 627 inline const FeatureInfo& Program::feature_info() const { |
| 627 return *manager_->feature_info_.get(); | 628 return *manager_->feature_info_.get(); |
| 628 } | 629 } |
| 629 | 630 |
| 630 } // namespace gles2 | 631 } // namespace gles2 |
| 631 } // namespace gpu | 632 } // namespace gpu |
| 632 | 633 |
| 633 #endif // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ | 634 #endif // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ |
| OLD | NEW |