diff options
author | Hal Canary <halcanary@google.com> | 2018-06-13 09:59:02 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-14 14:55:17 +0000 |
commit | c640d0dc96924699fdbb1a3cbdc907aa07b1cb3c (patch) | |
tree | d8973c4700da0bbe95c73bb3bc0c7d8f4589186d /src/gpu | |
parent | 4d4665436e540bd2ca393c139cbaff1eabd62ee2 (diff) |
Revert "Revert "SkTypes: extract SkTo""
This reverts commit fdcfb8b7c23fbf18f872d2c31d27978235033876.
> Original change's description:
> > SkTypes: extract SkTo
> >
> > Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09
> > Reviewed-on: https://skia-review.googlesource.com/133620
> > Reviewed-by: Mike Klein <mtklein@google.com>
Change-Id: Ida74fbc5c21248a724a5edbf9fae18a33bcb23aa
Reviewed-on: https://skia-review.googlesource.com/134506
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/GrClipStackClip.cpp | 11 | ||||
-rw-r--r-- | src/gpu/GrPathProcessor.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrProgramDesc.cpp | 3 | ||||
-rw-r--r-- | src/gpu/GrProgramDesc.h | 1 | ||||
-rw-r--r-- | src/gpu/GrRect.h | 1 | ||||
-rw-r--r-- | src/gpu/GrResourceCache.cpp | 2 | ||||
-rw-r--r-- | src/gpu/SkGpuDevice.cpp | 2 | ||||
-rw-r--r-- | src/gpu/effects/GrPorterDuffXferProcessor.cpp | 1 | ||||
-rw-r--r-- | src/gpu/gl/GrGLCreateNullInterface.cpp | 7 | ||||
-rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 4 | ||||
-rw-r--r-- | src/gpu/ops/GrOp.cpp | 1 | ||||
-rw-r--r-- | src/gpu/ops/GrTextureOp.cpp | 2 | ||||
-rw-r--r-- | src/gpu/text/GrTextContext.cpp | 6 | ||||
-rw-r--r-- | src/gpu/vk/GrVkGpu.cpp | 7 |
14 files changed, 33 insertions, 17 deletions
diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp index 92a6d04340..212aa364b5 100644 --- a/src/gpu/GrClipStackClip.cpp +++ b/src/gpu/GrClipStackClip.cpp @@ -13,18 +13,19 @@ #include "GrDrawingManager.h" #include "GrFixedClip.h" #include "GrGpuResourcePriv.h" -#include "GrRenderTargetContextPriv.h" #include "GrProxyProvider.h" -#include "GrStencilAttachment.h" +#include "GrRenderTargetContextPriv.h" #include "GrSWMaskHelper.h" +#include "GrStencilAttachment.h" #include "GrTextureProxy.h" -#include "effects/GrConvexPolyEffect.h" -#include "effects/GrRRectEffect.h" -#include "effects/GrTextureDomain.h" #include "SkClipOpPriv.h" #include "SkMakeUnique.h" #include "SkTaskGroup.h" +#include "SkTo.h" #include "SkTraceEvent.h" +#include "effects/GrConvexPolyEffect.h" +#include "effects/GrRRectEffect.h" +#include "effects/GrTextureDomain.h" typedef SkClipStack::Element Element; typedef GrReducedClip::InitialState InitialState; diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp index 43c0bb07ca..0b4354c45b 100644 --- a/src/gpu/GrPathProcessor.cpp +++ b/src/gpu/GrPathProcessor.cpp @@ -6,7 +6,9 @@ */ #include "GrPathProcessor.h" + #include "GrShaderCaps.h" +#include "SkTo.h" #include "gl/GrGLGpu.h" #include "gl/GrGLVaryingHandler.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp index 5b7e5e3bff..c552789d9f 100644 --- a/src/gpu/GrProgramDesc.cpp +++ b/src/gpu/GrProgramDesc.cpp @@ -4,7 +4,9 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + #include "GrProgramDesc.h" + #include "GrPipeline.h" #include "GrPrimitiveProcessor.h" #include "GrProcessor.h" @@ -12,6 +14,7 @@ #include "GrShaderCaps.h" #include "GrTexturePriv.h" #include "SkChecksum.h" +#include "SkTo.h" #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" diff --git a/src/gpu/GrProgramDesc.h b/src/gpu/GrProgramDesc.h index 68fdcdb964..f687876270 100644 --- a/src/gpu/GrProgramDesc.h +++ b/src/gpu/GrProgramDesc.h @@ -12,6 +12,7 @@ #include "GrTypesPriv.h" #include "SkOpts.h" #include "SkTArray.h" +#include "SkTo.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" class GrShaderCaps; diff --git a/src/gpu/GrRect.h b/src/gpu/GrRect.h index 95102a837b..8c44ed7705 100644 --- a/src/gpu/GrRect.h +++ b/src/gpu/GrRect.h @@ -8,6 +8,7 @@ #ifndef GrRect_DEFINED #define GrRect_DEFINED +#include "SkTo.h" #include "SkTypes.h" #include "SkRect.h" diff --git a/src/gpu/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp index 8ed359410c..4e69444b61 100644 --- a/src/gpu/GrResourceCache.cpp +++ b/src/gpu/GrResourceCache.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ - #include "GrResourceCache.h" #include "GrCaps.h" @@ -18,6 +17,7 @@ #include "SkMessageBus.h" #include "SkOpts.h" #include "SkTSort.h" +#include "SkTo.h" DECLARE_SKMESSAGEBUS_MESSAGE(GrUniqueKeyInvalidatedMessage); diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 210cefc7a7..ee8026c463 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -6,6 +6,7 @@ */ #include "SkGpuDevice.h" + #include "../private/SkShadowFlags.h" #include "GrBitmapTextureMaker.h" #include "GrBlurUtils.h" @@ -43,6 +44,7 @@ #include "SkSurface.h" #include "SkSurface_Gpu.h" #include "SkTLazy.h" +#include "SkTo.h" #include "SkUtils.h" #include "SkVertState.h" #include "SkVertices.h" diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp index c727670b4f..ca082603de 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp @@ -14,6 +14,7 @@ #include "GrProcessorAnalysis.h" #include "GrTypes.h" #include "GrXferProcessor.h" +#include "SkTo.h" #include "glsl/GrGLSLBlend.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp index 9df22659dd..a14fc67351 100644 --- a/src/gpu/gl/GrGLCreateNullInterface.cpp +++ b/src/gpu/gl/GrGLCreateNullInterface.cpp @@ -5,12 +5,13 @@ * found in the LICENSE file. */ - -#include "GrNonAtomicRef.h" -#include "gl/GrGLInterface.h" #include "GrGLTestInterface.h" +#include "GrNonAtomicRef.h" #include "SkMutex.h" #include "SkTDArray.h" +#include "SkTo.h" +#include "gl/GrGLInterface.h" + #include <type_traits> // added to suppress 'no previous prototype' warning and because this code is duplicated in diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 2c7d977659..88f5abecb4 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -7,7 +7,6 @@ #include "GrGLGpu.h" -#include <cmath> #include "../private/GrGLSL.h" #include "GrBackendSemaphore.h" #include "GrBackendSurface.h" @@ -35,10 +34,13 @@ #include "SkSLCompiler.h" #include "SkStrokeRec.h" #include "SkTemplates.h" +#include "SkTo.h" #include "SkTraceEvent.h" #include "SkTypes.h" #include "builders/GrGLShaderStringBuilder.h" +#include <cmath> + #define GL_CALL(X) GR_GL_CALL(this->glInterface(), X) #define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X) diff --git a/src/gpu/ops/GrOp.cpp b/src/gpu/ops/GrOp.cpp index 798d29d358..f020cdef67 100644 --- a/src/gpu/ops/GrOp.cpp +++ b/src/gpu/ops/GrOp.cpp @@ -9,6 +9,7 @@ #include "GrMemoryPool.h" #include "SkSpinlock.h" +#include "SkTo.h" // TODO I noticed a small benefit to using a larger exclusive pool for ops. Its very small, but // seems to be mostly consistent. There is a lot in flux right now, but we should really revisit diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp index 2301930e93..98228c5709 100644 --- a/src/gpu/ops/GrTextureOp.cpp +++ b/src/gpu/ops/GrTextureOp.cpp @@ -6,6 +6,7 @@ */ #include "GrTextureOp.h" + #include "GrAppliedClip.h" #include "GrCaps.h" #include "GrContext.h" @@ -26,6 +27,7 @@ #include "SkMatrixPriv.h" #include "SkPoint.h" #include "SkPoint3.h" +#include "SkTo.h" #include "glsl/GrGLSLColorSpaceXformHelper.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLGeometryProcessor.h" diff --git a/src/gpu/text/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp index 2fc1f5bca4..b63b726079 100644 --- a/src/gpu/text/GrTextContext.cpp +++ b/src/gpu/text/GrTextContext.cpp @@ -4,7 +4,9 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + #include "GrTextContext.h" + #include "GrCaps.h" #include "GrContext.h" #include "GrContextPriv.h" @@ -15,14 +17,14 @@ #include "SkDrawFilter.h" #include "SkDrawProcs.h" #include "SkFindAndPlaceGlyph.h" +#include "SkGlyphRun.h" #include "SkGr.h" #include "SkGraphics.h" -#include "SkGlyphRun.h" #include "SkMakeUnique.h" #include "SkMaskFilterBase.h" #include "SkPaintPriv.h" #include "SkTextMapStateProc.h" - +#include "SkTo.h" #include "ops/GrMeshDrawOp.h" // DF sizes and thresholds for usage of the small and medium sizes. For example, above diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index 346d95b0c2..d0eb8765ba 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp @@ -16,7 +16,6 @@ #include "GrPipeline.h" #include "GrRenderTargetPriv.h" #include "GrTexturePriv.h" - #include "GrVkAMDMemoryAllocator.h" #include "GrVkCommandBuffer.h" #include "GrVkGpuCommandBuffer.h" @@ -33,15 +32,13 @@ #include "GrVkTextureRenderTarget.h" #include "GrVkTransferBuffer.h" #include "GrVkVertexBuffer.h" - #include "SkConvertPixels.h" #include "SkMipMap.h" - +#include "SkSLCompiler.h" +#include "SkTo.h" #include "vk/GrVkInterface.h" #include "vk/GrVkTypes.h" -#include "SkSLCompiler.h" - #if !defined(SK_BUILD_FOR_WIN) #include <unistd.h> #endif // !defined(SK_BUILD_FOR_WIN) |