AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move prepareForExternalIO from GrRenderTarget to GrDrawContext

Browse Source 
This is part of the push to remove GrRenderTarget from SkGpuDevice

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2182543003

Review-Url: https://codereview.chromium.org/2182543003
This commit is contained in:
robertphillips 2016-07-26 07:41:00 -07:00 committed by Commit bot
parent 707bbd622b
commit 8c523e0f3f
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/gpu/GrDrawContext.h
View File

@ -253,6 +253,12 @@ public:
const SkIRect& center,
const SkRect& dst);
/**
* After this returns any pending surface IO will be issued to the backend 3D API and
* if the surface has MSAA it will be resolved.
*/
void prepareForExternalIO();
bool isStencilBufferMultisampled() const {
return fRenderTarget->isStencilBufferMultisampled();
}

7
include/gpu/GrSurface.h
View File

@ -114,13 +114,6 @@ public:
*/
void flushWrites();
/**
* After this returns any pending surface IO will be issued to the backend 3D API and
* if the surface has MSAA it will be resolved.
*/
void prepareForExternalIO();
/** Access methods that are only to be used within Skia code. */
inline GrSurfacePriv surfacePriv();
inline const GrSurfacePriv surfacePriv() const;

10
src/gpu/GrDrawContext.cpp
View File

@ -980,6 +980,16 @@ void GrDrawContext::drawImageNine(const GrClip& clip,
this->getDrawTarget()->drawBatch(pipelineBuilder, this, clip, batch);
}
void GrDrawContext::prepareForExternalIO() {
ASSERT_SINGLE_OWNER
RETURN_IF_ABANDONED
SkDEBUGCODE(this->validate();)
GR_AUDIT_TRAIL_AUTO_FRAME(fAuditTrail, "GrDrawContext::prepareForExternalIO");
ASSERT_OWNED_RESOURCE(fRenderTarget);
fDrawingManager->getContext()->prepareSurfaceForExternalIO(fRenderTarget.get());
}
void GrDrawContext::drawNonAAFilledRect(const GrClip& clip,
const GrPaint& paint,

6
src/gpu/GrSurface.cpp
View File

@ -149,12 +149,6 @@ void GrSurface::flushWrites() {
}
}
void GrSurface::prepareForExternalIO() {
if (!this->wasDestroyed()) {
this->getContext()->prepareSurfaceForExternalIO(this);
}
}
bool GrSurface::hasPendingRead() const {
const GrTexture* thisTex = this->asTexture();
if (thisTex && thisTex->internalHasPendingRead()) {

2
src/gpu/SkGpuDevice.cpp
View File

@ -1727,7 +1727,7 @@ bool SkGpuDevice::onShouldDisableLCD(const SkPaint& paint) const {
void SkGpuDevice::flush() {
ASSERT_SINGLE_OWNER
fRenderTarget->prepareForExternalIO();
fDrawContext->prepareForExternalIO();
}
///////////////////////////////////////////////////////////////////////////////