Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Side by Side Diff: gpu/command_buffer/service/program_manager.h

Issue 2958763003: Fix a bug in shader/program relationship. (Closed)
Patch Set: comments Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | gpu/command_buffer/service/program_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 FragmentInputInfoVector fragment_input_infos_; 562 FragmentInputInfoVector fragment_input_infos_;
563 FragmentInputLocationVector fragment_input_locations_; 563 FragmentInputLocationVector fragment_input_locations_;
564 564
565 ProgramOutputInfoVector program_output_infos_; 565 ProgramOutputInfoVector program_output_infos_;
566 566
567 // The program this Program is tracking. 567 // The program this Program is tracking.
568 GLuint service_id_; 568 GLuint service_id_;
569 569
570 // Shaders by type of shader. 570 // Shaders by type of shader.
571 scoped_refptr<Shader> attached_shaders_[kMaxAttachedShaders]; 571 scoped_refptr<Shader> attached_shaders_[kMaxAttachedShaders];
572 scoped_refptr<Shader> shaders_from_last_successful_link_[kMaxAttachedShaders];
572 573
573 // True if this program is marked as deleted. 574 // True if this program is marked as deleted.
574 bool deleted_; 575 bool deleted_;
575 576
576 // This is true if glLinkProgram was successful at least once. 577 // This is true if glLinkProgram was successful at least once.
577 bool valid_; 578 bool valid_;
578 579
579 // This is true if glLinkProgram was successful last time it was called. 580 // This is true if glLinkProgram was successful last time it was called.
580 bool link_status_; 581 bool link_status_;
581 582
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 }; 738 };
738 739
739 inline const FeatureInfo& Program::feature_info() const { 740 inline const FeatureInfo& Program::feature_info() const {
740 return *manager_->feature_info_.get(); 741 return *manager_->feature_info_.get();
741 } 742 }
742 743
743 } // namespace gles2 744 } // namespace gles2
744 } // namespace gpu 745 } // namespace gpu
745 746
746 #endif // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ 747 #endif // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/service/program_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698