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

Unified Diff: src/gpu/GrDrawContext.cpp

Issue 2299523004: Flush some non-substantive Ganesh changes (Closed)
Patch Set: Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/private/GrSurfaceProxy.h ('k') | src/gpu/batches/GrDiscardBatch.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrDrawContext.cpp
diff --git a/src/gpu/GrDrawContext.cpp b/src/gpu/GrDrawContext.cpp
index 2bb9caa8b170d994862b5e0e51965fe9159023b2..4f40cb5d3bf1b9b3832d749ba55da34067a5191f 100644
--- a/src/gpu/GrDrawContext.cpp
+++ b/src/gpu/GrDrawContext.cpp
@@ -245,10 +245,8 @@ void GrDrawContext::drawPaint(const GrClip& clip,
// set rect to be big enough to fill the space, but not super-huge, so we
// don't overflow fixed-point implementations
- SkRect r;
- r.setLTRB(0, 0,
- SkIntToScalar(fRenderTarget->width()),
- SkIntToScalar(fRenderTarget->height()));
+
+ SkRect r = fRenderTarget->getBoundsRect();
SkTCopyOnFirstWrite<GrPaint> paint(origPaint);
SkRRect rrect;
@@ -321,7 +319,7 @@ static bool should_apply_coverage_aa(const GrPaint& paint, GrRenderTarget* rt,
// Attempts to crop a rect and optional local rect to the clip boundaries.
// Returns false if the draw can be skipped entirely.
-static bool crop_filled_rect(const GrRenderTarget* rt, const GrClip& clip,
+static bool crop_filled_rect(int width, int height, const GrClip& clip,
const SkMatrix& viewMatrix, SkRect* rect,
SkRect* localRect = nullptr) {
if (!viewMatrix.rectStaysRect()) {
@@ -331,7 +329,7 @@ static bool crop_filled_rect(const GrRenderTarget* rt, const GrClip& clip,
SkIRect clipDevBounds;
SkRect clipBounds;
- clip.getConservativeBounds(rt->width(), rt->height(), &clipDevBounds);
+ clip.getConservativeBounds(width, height, &clipDevBounds);
if (!SkMatrixPriv::InverseMapRect(viewMatrix, &clipBounds, SkRect::Make(clipDevBounds))) {
return false;
}
@@ -370,7 +368,7 @@ bool GrDrawContext::drawFilledRect(const GrClip& clip,
const SkRect& rect,
const GrUserStencilSettings* ss) {
SkRect croppedRect = rect;
- if (!crop_filled_rect(fRenderTarget.get(), clip, viewMatrix, &croppedRect)) {
+ if (!crop_filled_rect(this->width(), this->height(), clip, viewMatrix, &croppedRect)) {
return true;
}
@@ -442,8 +440,7 @@ void GrDrawContext::drawRect(const GrClip& clip,
if (!fContext->caps()->useDrawInsteadOfClear()) {
// Check if this is a full RT draw and can be replaced with a clear. We don't bother
// checking cases where the RT is fully inside a stroke.
- SkRect rtRect;
- fRenderTarget->getBoundsRect(&rtRect);
+ SkRect rtRect = fRenderTarget->getBoundsRect();
// Does the clip contain the entire RT?
if (clip.quickContains(rtRect)) {
SkMatrix invM;
@@ -620,7 +617,8 @@ void GrDrawContext::fillRectToRect(const GrClip& clip,
SkRect croppedRect = rectToDraw;
SkRect croppedLocalRect = localRect;
- if (!crop_filled_rect(fRenderTarget.get(), clip, viewMatrix, &croppedRect, &croppedLocalRect)) {
+ if (!crop_filled_rect(this->width(), this->height(), clip, viewMatrix,
+ &croppedRect, &croppedLocalRect)) {
return;
}
@@ -679,7 +677,7 @@ void GrDrawContext::fillRectWithLocalMatrix(const GrClip& clip,
GR_AUDIT_TRAIL_AUTO_FRAME(fAuditTrail, "GrDrawContext::fillRectWithLocalMatrix");
SkRect croppedRect = rectToDraw;
- if (!crop_filled_rect(fRenderTarget.get(), clip, viewMatrix, &croppedRect)) {
+ if (!crop_filled_rect(this->width(), this->height(), clip, viewMatrix, &croppedRect)) {
return;
}
@@ -1257,9 +1255,9 @@ bool GrDrawContextPriv::drawAndStencilPath(const GrFixedClip& clip,
// the src color (either the input alpha or in the frag shader) to implement
// aa. If we have some future driver-mojo path AA that can do the right
// thing WRT to the blend then we'll need some query on the PR.
- bool useCoverageAA = doAA && !fDrawContext->fRenderTarget->isUnifiedMultisampled();
+ bool useCoverageAA = doAA && !fDrawContext->isUnifiedMultisampled();
bool hasUserStencilSettings = !ss->isUnused();
- bool isStencilBufferMSAA = fDrawContext->fRenderTarget->isStencilBufferMultisampled();
+ bool isStencilBufferMSAA = fDrawContext->isStencilBufferMultisampled();
const GrPathRendererChain::DrawType type =
useCoverageAA ? GrPathRendererChain::kColorAntiAlias_DrawType
@@ -1320,7 +1318,7 @@ void GrDrawContext::internalDrawPath(const GrClip& clip,
bool useCoverageAA = should_apply_coverage_aa(paint, fRenderTarget.get());
constexpr bool kHasUserStencilSettings = false;
- bool isStencilBufferMSAA = fRenderTarget->isStencilBufferMultisampled();
+ bool isStencilBufferMSAA = this->isStencilBufferMultisampled();
const GrPathRendererChain::DrawType type =
useCoverageAA ? GrPathRendererChain::kColorAntiAlias_DrawType
« no previous file with comments | « include/private/GrSurfaceProxy.h ('k') | src/gpu/batches/GrDiscardBatch.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698