Swap render target instead of creating a new gpu device for surface copy-on-write
Swap render target of the gpu device instead of creating a new gpu
device when making a copy-on-write upon surface modification.
This removes the SkCanvas::setRootDevice which contains problematic code
when trying to increase the use of SkImages internally in Skia.
BUG=skia:3388
Review URL: https://codereview.chromium.org/925343002
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 5781a58..ad63393 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -7,41 +7,40 @@
#include "SkGpuDevice.h"
-#include "effects/GrBicubicEffect.h"
-#include "effects/GrDashingEffect.h"
-#include "effects/GrTextureDomain.h"
-#include "effects/GrSimpleTextureEffect.h"
-
-#include "GrContext.h"
#include "GrBitmapTextContext.h"
+#include "GrContext.h"
#include "GrDistanceFieldTextContext.h"
+#include "GrGpu.h"
+#include "GrGpuResourcePriv.h"
#include "GrLayerHoister.h"
#include "GrRecordReplaceDraw.h"
#include "GrStrokeInfo.h"
#include "GrTracing.h"
-#include "GrGpu.h"
-
-#include "SkGrTexturePixelRef.h"
-
#include "SkCanvasPriv.h"
#include "SkDeviceImageFilterProxy.h"
#include "SkDrawProcs.h"
+#include "SkErrorInternals.h"
#include "SkGlyphCache.h"
+#include "SkGrTexturePixelRef.h"
#include "SkImageFilter.h"
#include "SkLayerInfo.h"
#include "SkMaskFilter.h"
#include "SkPathEffect.h"
#include "SkPicture.h"
#include "SkPictureData.h"
-#include "SkRecord.h"
#include "SkRRect.h"
+#include "SkRecord.h"
#include "SkStroke.h"
#include "SkSurface.h"
+#include "SkSurface_Gpu.h"
#include "SkTLazy.h"
#include "SkUtils.h"
#include "SkVertState.h"
#include "SkXfermode.h"
-#include "SkErrorInternals.h"
+#include "effects/GrBicubicEffect.h"
+#include "effects/GrDashingEffect.h"
+#include "effects/GrSimpleTextureEffect.h"
+#include "effects/GrTextureDomain.h"
#if SK_SUPPORT_GPU
@@ -164,9 +163,8 @@
fTextContext = fContext->createTextContext(fRenderTarget, this->getLeakyProperties(), useDFT);
}
-SkGpuDevice* SkGpuDevice::Create(GrContext* context, SkSurface::Budgeted budgeted,
- const SkImageInfo& origInfo, int sampleCount,
- const SkSurfaceProps* props, unsigned flags) {
+GrRenderTarget* SkGpuDevice::CreateRenderTarget(GrContext* context, SkSurface::Budgeted budgeted,
+ const SkImageInfo& origInfo, int sampleCount) {
if (kUnknown_SkColorType == origInfo.colorType() ||
origInfo.width() < 0 || origInfo.height() < 0) {
return NULL;
@@ -195,13 +193,24 @@
desc.fHeight = info.height();
desc.fConfig = SkImageInfo2GrPixelConfig(info);
desc.fSampleCnt = sampleCount;
+ GrTexture* texture = context->createTexture(desc, SkToBool(budgeted), NULL, 0);
+ if (NULL == texture) {
+ return NULL;
+ }
+ SkASSERT(NULL != texture->asRenderTarget());
+ return texture->asRenderTarget();
+}
- SkAutoTUnref<GrTexture> texture(context->createTexture(desc, SkToBool(budgeted), NULL, 0));
- if (!texture) {
+SkGpuDevice* SkGpuDevice::Create(GrContext* context, SkSurface::Budgeted budgeted,
+ const SkImageInfo& info, int sampleCount,
+ const SkSurfaceProps* props, unsigned flags) {
+
+ SkAutoTUnref<GrRenderTarget> rt(CreateRenderTarget(context, budgeted, info, sampleCount));
+ if (NULL == rt) {
return NULL;
}
- return SkNEW_ARGS(SkGpuDevice, (texture->asRenderTarget(), props, flags));
+ return SkNEW_ARGS(SkGpuDevice, (rt, props, flags));
}
SkGpuDevice::~SkGpuDevice() {
@@ -302,6 +311,38 @@
fNeedClear = false;
}
+void SkGpuDevice::replaceRenderTarget(bool shouldRetainContent) {
+ // Caller must have accessed the render target, because it knows the rt must be replaced.
+ SkASSERT(!fNeedClear);
+
+ SkSurface::Budgeted budgeted =
+ fRenderTarget->resourcePriv().isBudgeted() ? SkSurface::kYes_Budgeted
+ : SkSurface::kNo_Budgeted;
+
+ SkAutoTUnref<GrRenderTarget> newRT(CreateRenderTarget(
+ fRenderTarget->getContext(), budgeted, this->imageInfo(), fRenderTarget->numSamples()));
+
+ if (NULL == newRT) {
+ return;
+ }
+
+ if (shouldRetainContent) {
+ if (fRenderTarget->wasDestroyed()) {
+ return;
+ }
+ this->context()->copySurface(newRT, fRenderTarget);
+ }
+
+ SkASSERT(fRenderTarget != newRT);
+
+ fRenderTarget->unref();
+ fRenderTarget = newRT.detach();
+
+ SkASSERT(fRenderTarget->surfacePriv().info() == fLegacyBitmap.info());
+ SkPixelRef* pr = SkNEW_ARGS(SkGrPixelRef, (fRenderTarget->surfacePriv().info(), fRenderTarget));
+ fLegacyBitmap.setPixelRef(pr)->unref();
+}
+
///////////////////////////////////////////////////////////////////////////////
SK_COMPILE_ASSERT(SkShader::kNone_BitmapType == 0, shader_type_mismatch);
diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h
index 4830c02..cd2dcdc 100644
--- a/src/gpu/SkGpuDevice.h
+++ b/src/gpu/SkGpuDevice.h
@@ -62,6 +62,8 @@
// set all pixels to 0
void clearAll();
+ void replaceRenderTarget(bool shouldRetainContent);
+
GrRenderTarget* accessRenderTarget() SK_OVERRIDE;
SkImageInfo imageInfo() const SK_OVERRIDE {
@@ -199,6 +201,9 @@
static SkPicture::AccelData::Key ComputeAccelDataKey();
+ static GrRenderTarget* CreateRenderTarget(GrContext*, SkSurface::Budgeted, const SkImageInfo&,
+ int sampleCount);
+
typedef SkBaseDevice INHERITED;
};