diff options
| author |  robertphillips <robertphillips@google.com> | 2016-08-31 15:06:24 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-31 15:06:24 -0700 |
| commit | 13a7eee2504e7deb0e27ed3e69a787696d57b037 (patch) | |
| tree | be4bda801aa399016befedd2d288fe2f79300206 /include | |
| parent | 1da3ecd07836a72c9225c896d2516625906b4bda (diff) | |
Flush some non-substantive Ganesh changes
Split out of: https://codereview.chromium.org/2215323003/ (Start using RenderTargetProxy (omnibus))
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2299523004
Review-Url: https://codereview.chromium.org/2299523004
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrDrawContext.h | 2 | ||||
| -rw-r--r-- | include/gpu/GrSurface.h | 3 | ||||
| -rw-r--r-- | include/private/GrSurfaceProxy.h | 10 |
3 files changed, 11 insertions, 4 deletions
diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h index f3af2eb27d..cad2b827e4 100644 --- a/include/gpu/GrDrawContext.h +++ b/include/gpu/GrDrawContext.h @@ -341,8 +341,6 @@ public: GrRenderTarget* accessRenderTarget() { return fRenderTarget.get(); } - sk_sp<GrRenderTarget> renderTarget() { return fRenderTarget; } - sk_sp<GrTexture> asTexture() { return sk_ref_sp(fRenderTarget->asTexture()); } // Provides access to functions that aren't part of the public API. diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h index 24e2dfcb84..ac5c5fa1bb 100644 --- a/include/gpu/GrSurface.h +++ b/include/gpu/GrSurface.h @@ -33,8 +33,7 @@ public: /** * Helper that gets the width and height of the surface as a bounding rectangle. */ - void getBoundsRect(SkRect* rect) const { rect->setWH(SkIntToScalar(this->width()), - SkIntToScalar(this->height())); } + SkRect getBoundsRect() const { return SkRect::MakeIWH(this->width(), this->height()); } GrSurfaceOrigin origin() const { SkASSERT(kTopLeft_GrSurfaceOrigin == fDesc.fOrigin || kBottomLeft_GrSurfaceOrigin == fDesc.fOrigin); diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h index ad2ea91973..98979ac819 100644 --- a/include/private/GrSurfaceProxy.h +++ b/include/private/GrSurfaceProxy.h @@ -29,6 +29,11 @@ public: uint32_t uniqueID() const { return fUniqueID; } /** + * Helper that gets the width and height of the surface as a bounding rectangle. + */ + SkRect getBoundsRect() const { return SkRect::MakeIWH(this->width(), this->height()); } + + /** * @return the texture proxy associated with the surface proxy, may be NULL. */ virtual GrTextureProxy* asTextureProxy() { return nullptr; } @@ -40,6 +45,11 @@ public: virtual GrRenderTargetProxy* asRenderTargetProxy() { return nullptr; } virtual const GrRenderTargetProxy* asRenderTargetProxy() const { return nullptr; } + /** + * Does the resource count against the resource budget? + */ + SkBudgeted isBudgeted() const { return fBudgeted; } + protected: // Deferred version GrSurfaceProxy(const GrSurfaceDesc& desc, SkBackingFit fit, SkBudgeted budgeted) |