| 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 |
| 11 #include <map> | 11 #include <map> |
| 12 #include <memory> |
| 12 #include <string> | 13 #include <string> |
| 13 #include <vector> | 14 #include <vector> |
| 15 |
| 14 #include "base/logging.h" | 16 #include "base/logging.h" |
| 15 #include "base/macros.h" | 17 #include "base/macros.h" |
| 16 #include "base/memory/ref_counted.h" | 18 #include "base/memory/ref_counted.h" |
| 17 #include "gpu/command_buffer/service/common_decoder.h" | 19 #include "gpu/command_buffer/service/common_decoder.h" |
| 18 #include "gpu/command_buffer/service/gl_utils.h" | 20 #include "gpu/command_buffer/service/gl_utils.h" |
| 19 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" | 21 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
| 20 #include "gpu/command_buffer/service/shader_manager.h" | 22 #include "gpu/command_buffer/service/shader_manager.h" |
| 21 #include "gpu/gpu_export.h" | 23 #include "gpu/gpu_export.h" |
| 22 | 24 |
| 23 namespace gpu { | 25 namespace gpu { |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 // This is true if glLinkProgram was successful at least once. | 501 // This is true if glLinkProgram was successful at least once. |
| 500 bool valid_; | 502 bool valid_; |
| 501 | 503 |
| 502 // This is true if glLinkProgram was successful last time it was called. | 504 // This is true if glLinkProgram was successful last time it was called. |
| 503 bool link_status_; | 505 bool link_status_; |
| 504 | 506 |
| 505 // True if the uniforms have been cleared. | 507 // True if the uniforms have been cleared. |
| 506 bool uniforms_cleared_; | 508 bool uniforms_cleared_; |
| 507 | 509 |
| 508 // Log info | 510 // Log info |
| 509 scoped_ptr<std::string> log_info_; | 511 std::unique_ptr<std::string> log_info_; |
| 510 | 512 |
| 511 // attribute-location binding map from glBindAttribLocation() calls. | 513 // attribute-location binding map from glBindAttribLocation() calls. |
| 512 LocationMap bind_attrib_location_map_; | 514 LocationMap bind_attrib_location_map_; |
| 513 | 515 |
| 514 // uniform-location binding map from glBindUniformLocationCHROMIUM() calls. | 516 // uniform-location binding map from glBindUniformLocationCHROMIUM() calls. |
| 515 LocationMap bind_uniform_location_map_; | 517 LocationMap bind_uniform_location_map_; |
| 516 | 518 |
| 517 std::vector<std::string> transform_feedback_varyings_; | 519 std::vector<std::string> transform_feedback_varyings_; |
| 518 | 520 |
| 519 GLenum transform_feedback_buffer_mode_; | 521 GLenum transform_feedback_buffer_mode_; |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 }; | 619 }; |
| 618 | 620 |
| 619 inline const FeatureInfo& Program::feature_info() const { | 621 inline const FeatureInfo& Program::feature_info() const { |
| 620 return *manager_->feature_info_.get(); | 622 return *manager_->feature_info_.get(); |
| 621 } | 623 } |
| 622 | 624 |
| 623 } // namespace gles2 | 625 } // namespace gles2 |
| 624 } // namespace gpu | 626 } // namespace gpu |
| 625 | 627 |
| 626 #endif // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ | 628 #endif // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ |
| OLD | NEW |