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

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

Issue 2399113003: Add gl tests to make sure when a buffer is unmapped, all access path generates an INVALID_OPERATION. (Closed)
Patch Set: format Created 4 years, 2 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
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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 bool CheckVaryingsPacking(VaryingsPackingOption option) const; 379 bool CheckVaryingsPacking(VaryingsPackingOption option) const;
380 380
381 void TransformFeedbackVaryings(GLsizei count, const char* const* varyings, 381 void TransformFeedbackVaryings(GLsizei count, const char* const* varyings,
382 GLenum buffer_mode); 382 GLenum buffer_mode);
383 383
384 // Visible for testing 384 // Visible for testing
385 const LocationMap& bind_attrib_location_map() const { 385 const LocationMap& bind_attrib_location_map() const {
386 return bind_attrib_location_map_; 386 return bind_attrib_location_map_;
387 } 387 }
388 388
389 const std::vector<std::string>& transform_feedback_varyings() const { 389 const std::vector<std::string>& effective_transform_feedback_varyings()
390 return transform_feedback_varyings_; 390 const {
391 return effective_transform_feedback_varyings_;
391 } 392 }
392 393
393 GLenum transform_feedback_buffer_mode() const { 394 GLenum effective_transform_feedback_buffer_mode() const {
394 return transform_feedback_buffer_mode_; 395 return effective_transform_feedback_buffer_mode_;
395 } 396 }
396 397
397 // See member declaration for details. 398 // See member declaration for details.
398 // The data are only valid after a successful link. 399 // The data are only valid after a successful link.
399 uint32_t fragment_output_type_mask() const { 400 uint32_t fragment_output_type_mask() const {
400 return fragment_output_type_mask_; 401 return fragment_output_type_mask_;
401 } 402 }
402 uint32_t fragment_output_written_mask() const { 403 uint32_t fragment_output_written_mask() const {
403 return fragment_output_written_mask_; 404 return fragment_output_written_mask_;
404 } 405 }
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 547
547 // Log info 548 // Log info
548 std::unique_ptr<std::string> log_info_; 549 std::unique_ptr<std::string> log_info_;
549 550
550 // attribute-location binding map from glBindAttribLocation() calls. 551 // attribute-location binding map from glBindAttribLocation() calls.
551 LocationMap bind_attrib_location_map_; 552 LocationMap bind_attrib_location_map_;
552 553
553 // uniform-location binding map from glBindUniformLocationCHROMIUM() calls. 554 // uniform-location binding map from glBindUniformLocationCHROMIUM() calls.
554 LocationMap bind_uniform_location_map_; 555 LocationMap bind_uniform_location_map_;
555 556
557 // Set by glTransformFeedbackVaryings().
556 std::vector<std::string> transform_feedback_varyings_; 558 std::vector<std::string> transform_feedback_varyings_;
559 GLenum transform_feedback_buffer_mode_;
557 560
558 GLenum transform_feedback_buffer_mode_; 561 // After a successful link.
562 std::vector<std::string> effective_transform_feedback_varyings_;
563 GLenum effective_transform_feedback_buffer_mode_;
vmiura 2016/10/10 18:20:48 Please initialize effective_transform_feedback_buf
Zhenyao Mo 2016/10/10 21:02:07 Done.
559 564
560 // Fragment input-location binding map from 565 // Fragment input-location binding map from
561 // glBindFragmentInputLocationCHROMIUM() calls. 566 // glBindFragmentInputLocationCHROMIUM() calls.
562 LocationMap bind_fragment_input_location_map_; 567 LocationMap bind_fragment_input_location_map_;
563 568
564 // output variable - (location,index) binding map from 569 // output variable - (location,index) binding map from
565 // glBindFragDataLocation() and ..IndexedEXT() calls. 570 // glBindFragDataLocation() and ..IndexedEXT() calls.
566 LocationIndexMap bind_program_output_location_index_map_; 571 LocationIndexMap bind_program_output_location_index_map_;
567 572
568 // It's stored in the order of uniform block indices, i.e., the first 573 // It's stored in the order of uniform block indices, i.e., the first
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 }; 689 };
685 690
686 inline const FeatureInfo& Program::feature_info() const { 691 inline const FeatureInfo& Program::feature_info() const {
687 return *manager_->feature_info_.get(); 692 return *manager_->feature_info_.get();
688 } 693 }
689 694
690 } // namespace gles2 695 } // namespace gles2
691 } // namespace gpu 696 } // namespace gpu
692 697
693 #endif // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_ 698 #endif // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698