diff --git a/src/core/SkSpecialSurface.cpp b/src/core/SkSpecialSurface.cpp index 916d655407..b7a62c9b0f 100644 --- a/src/core/SkSpecialSurface.cpp +++ b/src/core/SkSpecialSurface.cpp @@ -124,7 +124,7 @@ sk_sp SkSpecialSurface::MakeRaster(const SkImageInfo& info, class SkSpecialSurface_Gpu : public SkSpecialSurface_Base { public: - SkSpecialSurface_Gpu(sk_sp device, SkIRect subset) + SkSpecialSurface_Gpu(sk_sp device, SkIRect subset) : INHERITED(subset, device->surfaceProps()) , fReadView(device->readSurfaceView()) { diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index ed2c2de75e..caead27bba 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -72,13 +72,13 @@ bool SkGpuDevice::CheckAlphaTypeAndGetFlags( return true; } -sk_sp SkGpuDevice::Make(GrRecordingContext* rContext, - GrColorType colorType, - sk_sp proxy, - sk_sp colorSpace, - GrSurfaceOrigin origin, - const SkSurfaceProps& surfaceProps, - InitContents init) { +sk_sp SkGpuDevice::Make(GrRecordingContext* rContext, + GrColorType colorType, + sk_sp proxy, + sk_sp colorSpace, + GrSurfaceOrigin origin, + const SkSurfaceProps& surfaceProps, + InitContents init) { auto sdc = GrSurfaceDrawContext::Make(rContext, colorType, std::move(proxy), @@ -89,9 +89,9 @@ sk_sp SkGpuDevice::Make(GrRecordingContext* rContext, return SkGpuDevice::Make(std::move(sdc), nullptr, init); } -sk_sp SkGpuDevice::Make(std::unique_ptr sdc, - const SkImageInfo* ii, - InitContents init) { +sk_sp SkGpuDevice::Make(std::unique_ptr sdc, + const SkImageInfo* ii, + InitContents init) { if (!sdc) { return nullptr; } @@ -111,16 +111,16 @@ sk_sp SkGpuDevice::Make(std::unique_ptr sdc, return sk_sp(new SkGpuDevice(std::move(sdc), flags)); } -sk_sp SkGpuDevice::Make(GrRecordingContext* rContext, - SkBudgeted budgeted, - const SkImageInfo& ii, - SkBackingFit fit, - int sampleCount, - GrMipmapped mipMapped, - GrProtected isProtected, - GrSurfaceOrigin origin, - const SkSurfaceProps& props, - InitContents init) { +sk_sp SkGpuDevice::Make(GrRecordingContext* rContext, + SkBudgeted budgeted, + const SkImageInfo& ii, + SkBackingFit fit, + int sampleCount, + GrMipmapped mipMapped, + GrProtected isProtected, + GrSurfaceOrigin origin, + const SkSurfaceProps& props, + InitContents init) { auto sdc = MakeSurfaceDrawContext(rContext, budgeted, ii, diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h index 6326a8f63c..e9f6cd4b07 100644 --- a/src/gpu/SkGpuDevice.h +++ b/src/gpu/SkGpuDevice.h @@ -74,13 +74,13 @@ public: * This factory uses the color space, origin, surface properties, and initialization * method along with the provided proxy to create the gpu device. */ - static sk_sp Make(GrRecordingContext*, - GrColorType, - sk_sp, - sk_sp, - GrSurfaceOrigin, - const SkSurfaceProps&, - InitContents); + static sk_sp Make(GrRecordingContext*, + GrColorType, + sk_sp, + sk_sp, + GrSurfaceOrigin, + const SkSurfaceProps&, + InitContents); /** * This factory uses the budgeted, imageInfo, fit, sampleCount, mipmapped, and isProtected @@ -88,16 +88,16 @@ public: * origin, surface properties, and initialization method are then used (with the created proxy) * to create the device. */ - static sk_sp Make(GrRecordingContext*, - SkBudgeted, - const SkImageInfo&, - SkBackingFit, - int sampleCount, - GrMipmapped, - GrProtected, - GrSurfaceOrigin, - const SkSurfaceProps&, - InitContents); + static sk_sp Make(GrRecordingContext*, + SkBudgeted, + const SkImageInfo&, + SkBackingFit, + int sampleCount, + GrMipmapped, + GrProtected, + GrSurfaceOrigin, + const SkSurfaceProps&, + InitContents); ~SkGpuDevice() override {} @@ -203,9 +203,9 @@ private: static bool CheckAlphaTypeAndGetFlags(const SkImageInfo* info, InitContents init, unsigned* flags); - static sk_sp Make(std::unique_ptr, - const SkImageInfo*, - InitContents); + static sk_sp Make(std::unique_ptr, + const SkImageInfo*, + InitContents); SkGpuDevice(std::unique_ptr, unsigned flags); diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index 2b70f67e28..b606529807 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp @@ -26,7 +26,6 @@ #include "src/gpu/GrSurfaceDrawContext.h" #include "src/gpu/GrTexture.h" #include "src/gpu/GrThreadSafePipelineBuilder.h" -#include "src/gpu/SkGpuDevice.h" #include "src/gpu/SkGr.h" #include "src/gpu/vk/GrVkAMDMemoryAllocator.h" #include "src/gpu/vk/GrVkBuffer.h" diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp index cef65cb0f1..7c0d61ae62 100644 --- a/src/image/SkSurface_Gpu.cpp +++ b/src/image/SkSurface_Gpu.cpp @@ -30,7 +30,7 @@ #if SK_SUPPORT_GPU -SkSurface_Gpu::SkSurface_Gpu(sk_sp device) +SkSurface_Gpu::SkSurface_Gpu(sk_sp device) : INHERITED(device->width(), device->height(), &device->surfaceProps()) , fDevice(std::move(device)) { SkASSERT(fDevice->targetProxy()->priv().isExact()); @@ -463,10 +463,10 @@ sk_sp SkSurface::MakeRenderTarget(GrRecordingContext* rContext, SkBud mipMapped = GrMipmapped::kNo; } - sk_sp device(SkGpuDevice::Make(rContext, budgeted, info, SkBackingFit::kExact, - sampleCount, mipMapped, GrProtected::kNo, origin, - SkSurfacePropsCopyOrDefault(props), - SkBaseGpuDevice::kClear_InitContents)); + sk_sp device(SkGpuDevice::Make(rContext, budgeted, info, SkBackingFit::kExact, + sampleCount, mipMapped, GrProtected::kNo, + origin, SkSurfacePropsCopyOrDefault(props), + SkBaseGpuDevice::kClear_InitContents)); if (!device) { return nullptr; } diff --git a/src/image/SkSurface_Gpu.h b/src/image/SkSurface_Gpu.h index c1d404bdc7..7a7047074d 100644 --- a/src/image/SkSurface_Gpu.h +++ b/src/image/SkSurface_Gpu.h @@ -19,7 +19,7 @@ class SkGpuDevice; class SkSurface_Gpu : public SkSurface_Base { public: - SkSurface_Gpu(sk_sp); + SkSurface_Gpu(sk_sp); ~SkSurface_Gpu() override; GrRecordingContext* onGetRecordingContext() override; @@ -61,7 +61,7 @@ public: SkBaseGpuDevice* getDevice(); private: - sk_sp fDevice; + sk_sp fDevice; using INHERITED = SkSurface_Base; }; diff --git a/tests/ClipBoundsTest.cpp b/tests/ClipBoundsTest.cpp index 28fdb32c26..37c825d573 100644 --- a/tests/ClipBoundsTest.cpp +++ b/tests/ClipBoundsTest.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/SkGpuDevice.h" +#include "include/gpu/GrTypes.h" // For the GrClipStack case, this is covered in GrClipStack_RectDeviceClip #if defined(SK_DISABLE_NEW_GR_CLIP_STACK) diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp index 465e33206d..38e3464b03 100644 --- a/tests/ClipStackTest.cpp +++ b/tests/ClipStackTest.cpp @@ -1545,8 +1545,6 @@ DEF_TEST(ClipStack, reporter) { ////////////////////////////////////////////////////////////////////////////// -#include "src/gpu/SkGpuDevice.h" - // For the GrClipStack case, this is covered in GrClipStack_SWMask #if defined(SK_DISABLE_NEW_GR_CLIP_STACK) diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp index 0604d268a8..3eb239f518 100644 --- a/tests/DeferredDisplayListTest.cpp +++ b/tests/DeferredDisplayListTest.cpp @@ -36,7 +36,6 @@ #include "src/gpu/GrRenderTargetProxy.h" #include "src/gpu/GrSurfaceDrawContext.h" #include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGpuDevice.h" #include "src/gpu/gl/GrGLDefines.h" #include "src/image/SkImage_GpuBase.h" #include "src/image/SkSurface_Gpu.h" diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp index 3946d0ff70..3a7f8cfc36 100644 --- a/tests/GrMipMappedTest.cpp +++ b/tests/GrMipMappedTest.cpp @@ -26,7 +26,7 @@ #include "src/gpu/GrSurfaceProxyPriv.h" #include "src/gpu/GrTexture.h" #include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGpuDevice.h" +#include "src/gpu/SkBaseGpuDevice.h" #include "src/image/SkImage_Base.h" #include "src/image/SkSurface_Gpu.h" #include "tests/Test.h" diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index bf3328dae9..311503159b 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -25,7 +25,7 @@ #include "src/gpu/GrRenderTarget.h" #include "src/gpu/GrResourceProvider.h" #include "src/gpu/GrSurfaceDrawContext.h" -#include "src/gpu/SkGpuDevice.h" +#include "src/gpu/SkBaseGpuDevice.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_Gpu.h" #include "src/image/SkSurface_Gpu.h" diff --git a/tests/VkBackendSurfaceTest.cpp b/tests/VkBackendSurfaceTest.cpp index 80d48c6166..20f9e8bfa8 100644 --- a/tests/VkBackendSurfaceTest.cpp +++ b/tests/VkBackendSurfaceTest.cpp @@ -19,7 +19,6 @@ #include "src/gpu/GrSurfaceDrawContext.h" #include "src/gpu/GrTexture.h" #include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGpuDevice.h" #include "src/gpu/vk/GrVkGpu.h" #include "src/gpu/vk/GrVkImageLayout.h" #include "src/gpu/vk/GrVkTexture.h"