diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-05-23 19:02:57 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-23 19:03:01 +0000 |
| commit | a9e795eab5f59a52d96b8fdc39351452835f5eb9 (patch) | |
| tree | 485e9f49fdb82f416014eea8d7fb397938466fd9 /include/private/GrSurfaceProxy.h | |
| parent | e8fa42768106bd7f4ca7bf5c72dde442a29d43cf (diff) | |
Revert "Add a flag to GrSurfaceFlags that requires the texture to be cleared upon creation. "
This reverts commit 45e5068a6d10f4e4fd4658824310f8871f02ccf7.
Reason for revert: :'(
Original change's description:
> Add a flag to GrSurfaceFlags that requires the texture to be cleared upon creation.
>
> Bug: chromium:656320
>
> Change-Id: I940bfa24540516ab83a2ed52f761b96eb6ad19f1
> Reviewed-on: https://skia-review.googlesource.com/17391
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Bug: chromium:656320
Change-Id: I8a4f71537e45f3c4cf37b10b2dc8ee38fe6959ba
Reviewed-on: https://skia-review.googlesource.com/17765
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include/private/GrSurfaceProxy.h')
| -rw-r--r-- | include/private/GrSurfaceProxy.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h index 4ae041d4dd..1b7950c510 100644 --- a/include/private/GrSurfaceProxy.h +++ b/include/private/GrSurfaceProxy.h @@ -323,7 +323,6 @@ protected: , fFit(fit) , fBudgeted(budgeted) , fFlags(flags) - , fNeedsClear(SkToBool(desc.fFlags & kPerformInitialClear_GrSurfaceFlag)) , fGpuMemorySize(kInvalidGpuMemorySize) , fLastOpList(nullptr) { // Note: this ctor pulls a new uniqueID from the same pool at the GrGpuResources @@ -360,6 +359,7 @@ protected: // mutable bc of SkSurface/SkImage wishy-washiness const uint32_t fFlags; + const UniqueID fUniqueID; // set from the backing resource for wrapped resources static const size_t kInvalidGpuMemorySize = ~static_cast<size_t>(0); @@ -368,8 +368,6 @@ protected: private: virtual size_t onUninstantiatedGpuMemorySize() const = 0; - bool fNeedsClear; - // This entry is lazily evaluated so, when the proxy wraps a resource, the resource // will be called but, when the proxy is deferred, it will compute the answer itself. // If the proxy computes its own answer that answer is checked (in debug mode) in |