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

Side by Side Diff: cc/resources/resource_provider.h

Issue 1957583002: cc: Add GpuMemoryBufferId to TextureMailbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unsigned -> signed Created 4 years, 7 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 | « cc/output/overlay_unittest.cc ('k') | cc/resources/resource_provider.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 CC_RESOURCES_RESOURCE_PROVIDER_H_ 5 #ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_
6 #define CC_RESOURCES_RESOURCE_PROVIDER_H_ 6 #define CC_RESOURCES_RESOURCE_PROVIDER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 GLenum original_filter; 563 GLenum original_filter;
564 GLenum filter; 564 GLenum filter;
565 unsigned image_id; 565 unsigned image_id;
566 unsigned bound_image_id; 566 unsigned bound_image_id;
567 TextureHint hint; 567 TextureHint hint;
568 ResourceType type; 568 ResourceType type;
569 ResourceFormat format; 569 ResourceFormat format;
570 SharedBitmapId shared_bitmap_id; 570 SharedBitmapId shared_bitmap_id;
571 SharedBitmap* shared_bitmap; 571 SharedBitmap* shared_bitmap;
572 std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer; 572 std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer;
573 gfx::GpuMemoryBufferId gpu_memory_buffer_id;
573 574
574 private: 575 private:
575 SynchronizationState synchronization_state_ = SYNCHRONIZED; 576 SynchronizationState synchronization_state_ = SYNCHRONIZED;
576 bool needs_sync_token_ = false; 577 bool needs_sync_token_ = false;
577 TextureMailbox mailbox_; 578 TextureMailbox mailbox_;
578 579
579 DISALLOW_COPY_AND_ASSIGN(Resource); 580 DISALLOW_COPY_AND_ASSIGN(Resource);
580 }; 581 };
581 using ResourceMap = std::unordered_map<ResourceId, Resource>; 582 using ResourceMap = std::unordered_map<ResourceId, Resource>;
582 583
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 // A process-unique ID used for disambiguating memory dumps from different 681 // A process-unique ID used for disambiguating memory dumps from different
681 // resource providers. 682 // resource providers.
682 int tracing_id_; 683 int tracing_id_;
683 684
684 DISALLOW_COPY_AND_ASSIGN(ResourceProvider); 685 DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
685 }; 686 };
686 687
687 } // namespace cc 688 } // namespace cc
688 689
689 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ 690 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_
OLDNEW
« no previous file with comments | « cc/output/overlay_unittest.cc ('k') | cc/resources/resource_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698