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

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

Issue 1387283002: cc: Remove redundant is_overlay arguments (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 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 <deque> 8 #include <deque>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 GLenum TargetForTesting(ResourceId id); 415 GLenum TargetForTesting(ResourceId id);
416 416
417 // Sets the current read fence. If a resource is locked for read 417 // Sets the current read fence. If a resource is locked for read
418 // and has read fences enabled, the resource will not allow writes 418 // and has read fences enabled, the resource will not allow writes
419 // until this fence has passed. 419 // until this fence has passed.
420 void SetReadLockFence(Fence* fence) { current_read_lock_fence_ = fence; } 420 void SetReadLockFence(Fence* fence) { current_read_lock_fence_ = fence; }
421 421
422 // Indicates if we can currently lock this resource for write. 422 // Indicates if we can currently lock this resource for write.
423 bool CanLockForWrite(ResourceId id); 423 bool CanLockForWrite(ResourceId id);
424 424
425 bool IsBoundToImage(ResourceId id);
426
425 void WaitSyncPointIfNeeded(ResourceId id); 427 void WaitSyncPointIfNeeded(ResourceId id);
426 428
427 static GLint GetActiveTextureUnit(gpu::gles2::GLES2Interface* gl); 429 static GLint GetActiveTextureUnit(gpu::gles2::GLES2Interface* gl);
428 430
429 OutputSurface* output_surface() { return output_surface_; } 431 OutputSurface* output_surface() { return output_surface_; }
430 432
431 void ValidateResource(ResourceId id) const; 433 void ValidateResource(ResourceId id) const;
432 434
433 GLenum GetImageTextureTarget(ResourceFormat format); 435 GLenum GetImageTextureTarget(ResourceFormat format);
434 436
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 int lock_for_read_count; 490 int lock_for_read_count;
489 int imported_count; 491 int imported_count;
490 int exported_count; 492 int exported_count;
491 bool dirty_image : 1; 493 bool dirty_image : 1;
492 bool locked_for_write : 1; 494 bool locked_for_write : 1;
493 bool lost : 1; 495 bool lost : 1;
494 bool marked_for_deletion : 1; 496 bool marked_for_deletion : 1;
495 bool allocated : 1; 497 bool allocated : 1;
496 bool read_lock_fences_enabled : 1; 498 bool read_lock_fences_enabled : 1;
497 bool has_shared_bitmap_id : 1; 499 bool has_shared_bitmap_id : 1;
500 bool bound_to_image : 1;
reveman 2015/10/07 09:32:58 I think this is a bit confusing as we already have
ccameron 2015/10/07 19:13:11 Yeah the original name promises a bit too much. Ch
reveman 2015/10/07 19:24:18 Good point.
498 scoped_refptr<Fence> read_lock_fence; 501 scoped_refptr<Fence> read_lock_fence;
499 gfx::Size size; 502 gfx::Size size;
500 Origin origin; 503 Origin origin;
501 GLenum target; 504 GLenum target;
502 // TODO(skyostil): Use a separate sampler object for filter state. 505 // TODO(skyostil): Use a separate sampler object for filter state.
503 GLenum original_filter; 506 GLenum original_filter;
504 GLenum filter; 507 GLenum filter;
505 unsigned image_id; 508 unsigned image_id;
506 unsigned bound_image_id; 509 unsigned bound_image_id;
507 GLenum texture_pool; 510 GLenum texture_pool;
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 // A process-unique ID used for disambiguating memory dumps from different 605 // A process-unique ID used for disambiguating memory dumps from different
603 // resource providers. 606 // resource providers.
604 int tracing_id_; 607 int tracing_id_;
605 608
606 DISALLOW_COPY_AND_ASSIGN(ResourceProvider); 609 DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
607 }; 610 };
608 611
609 } // namespace cc 612 } // namespace cc
610 613
611 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ 614 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698