diff options
| -rw-r--r-- | debugger/QT/SkGLWidget.cpp | 4 | ||||
| -rw-r--r-- | include/gpu/SkGpuDevice.h | 18 | ||||
| -rw-r--r-- | samplecode/SampleApp.cpp | 2 | ||||
| -rw-r--r-- | tests/GpuDrawPathTest.cpp | 2 | ||||
| -rw-r--r-- | tests/ReadWriteAlphaTest.cpp | 2 | ||||
| -rw-r--r-- | tests/ResourceCacheTest.cpp | 2 |
6 files changed, 10 insertions, 20 deletions
diff --git a/debugger/QT/SkGLWidget.cpp b/debugger/QT/SkGLWidget.cpp index 019654fe0d..602dc24fda 100644 --- a/debugger/QT/SkGLWidget.cpp +++ b/debugger/QT/SkGLWidget.cpp @@ -47,7 +47,7 @@ void SkGLWidget::initializeGL() { GrBackendRenderTargetDesc desc = this->getDesc(this->width(), this->height()); desc.fOrigin = kBottomLeft_GrSurfaceOrigin; GrRenderTarget* curRenderTarget = fCurContext->wrapBackendRenderTarget(desc); - fGpuDevice = new SkGpuDevice(fCurContext, curRenderTarget); + fGpuDevice = SkGpuDevice::Create(curRenderTarget); fCanvas = new SkCanvas(fGpuDevice); curRenderTarget->unref(); } @@ -65,7 +65,7 @@ void SkGLWidget::resizeGL(int w, int h) { GrRenderTarget* curRenderTarget = fCurContext->wrapBackendRenderTarget(desc); SkSafeUnref(fGpuDevice); SkSafeUnref(fCanvas); - fGpuDevice = new SkGpuDevice(fCurContext, curRenderTarget); + fGpuDevice = SkGpuDevice::Create(curRenderTarget); fCanvas = new SkCanvas(fGpuDevice); } fDebugger->resize(w, h); diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h index aebdf8ffe3..96f3d84dec 100644 --- a/include/gpu/SkGpuDevice.h +++ b/include/gpu/SkGpuDevice.h @@ -53,20 +53,6 @@ public: */ static SkGpuDevice* Create(GrContext*, const SkImageInfo&, int sampleCount); - /** - * DEPRECATED -- need to make this private, call Create(surface) - * New device that will render to the specified renderTarget. - */ - SkGpuDevice(GrContext*, GrRenderTarget*, unsigned flags = 0); - - /** - * DEPRECATED -- need to make this private, call Create(surface) - * New device that will render to the texture (as a rendertarget). - * The GrTexture's asRenderTarget() must be non-NULL or device will not - * function. - */ - SkGpuDevice(GrContext*, GrTexture*, unsigned flags = 0); - virtual ~SkGpuDevice(); GrContext* context() const { return fContext; } @@ -174,6 +160,10 @@ private: // remove when our clients don't rely on accessBitmap() SkBitmap fLegacyBitmap; + SkGpuDevice(GrContext*, GrRenderTarget*, unsigned flags = 0); + + SkGpuDevice(GrContext*, GrTexture*, unsigned flags = 0); + // called from rt and tex cons void initFromRenderTarget(GrContext*, GrRenderTarget*, unsigned flags); diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 29233d0391..34d1b97360 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -275,7 +275,7 @@ public: SampleWindow* win) { #if SK_SUPPORT_GPU if (IsGpuDeviceType(dType) && NULL != fCurContext) { - SkAutoTUnref<SkBaseDevice> device(new SkGpuDevice(fCurContext, fCurRenderTarget)); + SkAutoTUnref<SkBaseDevice> device(SkGpuDevice::Create(fCurRenderTarget)); return new SkCanvas(device); } else #endif diff --git a/tests/GpuDrawPathTest.cpp b/tests/GpuDrawPathTest.cpp index 3dcba52bd9..98313aabaa 100644 --- a/tests/GpuDrawPathTest.cpp +++ b/tests/GpuDrawPathTest.cpp @@ -64,7 +64,7 @@ DEF_GPUTEST(GpuDrawPath, reporter, factory) { desc.fHeight = H; desc.fSampleCnt = sampleCounts[i]; SkAutoTUnref<GrTexture> texture(grContext->createUncachedTexture(desc, NULL, 0)); - SkAutoTUnref<SkGpuDevice> device(SkNEW_ARGS(SkGpuDevice, (grContext, texture.get()))); + SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(texture.get())); SkCanvas drawingCanvas(device.get()); test_drawPathEmpty(reporter, &drawingCanvas); diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp index 06ede48afd..a320347637 100644 --- a/tests/ReadWriteAlphaTest.cpp +++ b/tests/ReadWriteAlphaTest.cpp @@ -81,7 +81,7 @@ DEF_GPUTEST(ReadWriteAlpha, reporter, factory) { REPORTER_ASSERT(reporter, match); // Now try writing on the single channel texture - SkAutoTUnref<SkBaseDevice> device(new SkGpuDevice(context, texture->asRenderTarget())); + SkAutoTUnref<SkBaseDevice> device(SkGpuDevice::Create(texture->asRenderTarget())); SkCanvas canvas(device); SkPaint paint; diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp index ae140e2846..c08e75f62c 100644 --- a/tests/ResourceCacheTest.cpp +++ b/tests/ResourceCacheTest.cpp @@ -298,7 +298,7 @@ DEF_GPUTEST(ResourceCache, reporter, factory) { desc.fHeight = gHeight; SkAutoTUnref<GrTexture> texture(context->createUncachedTexture(desc, NULL, 0)); - SkAutoTUnref<SkGpuDevice> device(SkNEW_ARGS(SkGpuDevice, (context, texture.get()))); + SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(texture.get())); SkCanvas canvas(device.get()); test_cache(reporter, context, &canvas); |