diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp index 67a65901be..6133c07657 100644 --- a/bench/GrResourceCacheBench.cpp +++ b/bench/GrResourceCacheBench.cpp @@ -9,7 +9,7 @@ #include "include/core/SkCanvas.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrGpuResource.h" #include "src/gpu/GrGpuResourcePriv.h" diff --git a/bench/ImageCacheBudgetBench.cpp b/bench/ImageCacheBudgetBench.cpp index eb70543c18..3d8837c5a3 100644 --- a/bench/ImageCacheBudgetBench.cpp +++ b/bench/ImageCacheBudgetBench.cpp @@ -10,7 +10,7 @@ #include "include/core/SkImage.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "tools/ToolUtils.h" diff --git a/bench/SKPBench.cpp b/bench/SKPBench.cpp index 8cb8a68356..bcf2bbf97f 100644 --- a/bench/SKPBench.cpp +++ b/bench/SKPBench.cpp @@ -8,7 +8,7 @@ #include "bench/SKPBench.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "tools/flags/CommandLineFlags.h" diff --git a/bench/TessellateBench.cpp b/bench/TessellateBench.cpp index b19d02af7b..01ed8f77a6 100644 --- a/bench/TessellateBench.cpp +++ b/bench/TessellateBench.cpp @@ -8,7 +8,7 @@ #include "bench/Benchmark.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkPathPriv.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrOpFlushState.h" #include "src/gpu/tessellate/GrMiddleOutPolygonTriangulator.h" #include "src/gpu/tessellate/GrPathTessellateOp.h" diff --git a/bench/VertexColorSpaceBench.cpp b/bench/VertexColorSpaceBench.cpp index 8ae0719e30..fdb7889e6a 100644 --- a/bench/VertexColorSpaceBench.cpp +++ b/bench/VertexColorSpaceBench.cpp @@ -11,7 +11,7 @@ #include "include/gpu/GrDirectContext.h" #include "include/private/SkHalf.h" #include "src/core/SkColorSpacePriv.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGeometryProcessor.h" #include "src/gpu/GrMemoryPool.h" #include "src/gpu/GrProgramInfo.h" diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index a293cb2184..ffb42cf74b 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -73,7 +73,7 @@ extern bool gSkVMJITViaDylib; #include "include/gpu/GrDirectContext.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/SkGr.h" #include "src/gpu/gl/GrGLDefines.h" #include "src/gpu/gl/GrGLGpu.h" diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index aeb3946bca..c7f3601bb1 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -43,7 +43,7 @@ #include "src/core/SkRecordDraw.h" #include "src/core/SkRecorder.h" #include "src/core/SkTaskGroup.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/utils/SkMultiPictureDocumentPriv.h" #include "src/utils/SkOSPath.h" diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp index 0f9a367954..73205a5b99 100644 --- a/fuzz/FuzzCanvas.cpp +++ b/fuzz/FuzzCanvas.cpp @@ -52,7 +52,7 @@ #ifdef SK_GL #include "include/gpu/GrDirectContext.h" #include "include/gpu/gl/GrGLFunctions.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/gl/GrGLGpu.h" #include "src/gpu/gl/GrGLUtil.h" #include "tools/gpu/GrContextFactory.h" diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index 55d5ca082d..b66e9fc260 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -28,7 +28,7 @@ #include "src/core/SkGeometry.h" #include "src/core/SkPointPriv.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGeometryProcessor.h" #include "src/gpu/GrMemoryPool.h" #include "src/gpu/GrOpFlushState.h" diff --git a/gm/clockwise.cpp b/gm/clockwise.cpp index e7a36292d0..b9311f7925 100644 --- a/gm/clockwise.cpp +++ b/gm/clockwise.cpp @@ -23,7 +23,7 @@ #include "src/gpu/GrBuffer.h" #include "src/gpu/GrCaps.h" #include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGeometryProcessor.h" #include "src/gpu/GrGpuBuffer.h" #include "src/gpu/GrMemoryPool.h" diff --git a/gm/flippity.cpp b/gm/flippity.cpp index aaf9722605..31c0a5411d 100644 --- a/gm/flippity.cpp +++ b/gm/flippity.cpp @@ -27,7 +27,7 @@ #include "include/gpu/GrRecordingContext.h" #include "include/gpu/GrTypes.h" #include "include/private/SkTArray.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_Gpu.h" #include "tools/ToolUtils.h" diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp index a373627a17..a2a9291aa9 100644 --- a/gm/fontcache.cpp +++ b/gm/fontcache.cpp @@ -23,7 +23,7 @@ #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "tools/ToolUtils.h" class GrRenderTargetContext; diff --git a/gm/fontregen.cpp b/gm/fontregen.cpp index fe686899c9..e05e9c3b51 100644 --- a/gm/fontregen.cpp +++ b/gm/fontregen.cpp @@ -33,7 +33,7 @@ #include "include/gpu/GrRecordingContext.h" #include "include/private/GrTypesPriv.h" #include "include/private/SkTemplates.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "tools/ToolUtils.h" class GrRenderTargetContext; diff --git a/gm/fp_sample_chaining.cpp b/gm/fp_sample_chaining.cpp index 9991e4426f..35a1693a9e 100644 --- a/gm/fp_sample_chaining.cpp +++ b/gm/fp_sample_chaining.cpp @@ -9,7 +9,7 @@ #include "include/core/SkFont.h" #include "include/effects/SkRuntimeEffect.h" #include "src/gpu/GrBitmapTextureMaker.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRenderTargetContextPriv.h" #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" #include "src/gpu/ops/GrFillRectOp.h" diff --git a/gm/fpcoordinateoverride.cpp b/gm/fpcoordinateoverride.cpp index 42155b6e31..054e2cab91 100644 --- a/gm/fpcoordinateoverride.cpp +++ b/gm/fpcoordinateoverride.cpp @@ -19,7 +19,7 @@ #include "include/core/SkTypes.h" #include "src/gpu/GrBitmapTextureMaker.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrFragmentProcessor.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrRenderTargetContextPriv.h" diff --git a/gm/fwidth_squircle.cpp b/gm/fwidth_squircle.cpp index bd2be0fe8c..de26623b5c 100644 --- a/gm/fwidth_squircle.cpp +++ b/gm/fwidth_squircle.cpp @@ -18,7 +18,7 @@ #include "include/private/GrTypesPriv.h" #include "src/gpu/GrBuffer.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGeometryProcessor.h" #include "src/gpu/GrGpuBuffer.h" #include "src/gpu/GrMemoryPool.h" diff --git a/gm/preservefillrule.cpp b/gm/preservefillrule.cpp index 26e43bb5e1..e00b4f2d1d 100644 --- a/gm/preservefillrule.cpp +++ b/gm/preservefillrule.cpp @@ -10,7 +10,7 @@ #include "include/core/SkPath.h" #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrRenderTargetContext.h" diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp index 7dbd16497b..35cdf60585 100644 --- a/gm/rectangletexture.cpp +++ b/gm/rectangletexture.cpp @@ -31,7 +31,7 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrTypes.h" #include "src/core/SkAutoPixmapStorage.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/gl/GrGLCaps.h" #include "src/gpu/gl/GrGLDefines.h" diff --git a/gm/sample_matrix_constant.cpp b/gm/sample_matrix_constant.cpp index c96ac7636f..ddd2b463b8 100644 --- a/gm/sample_matrix_constant.cpp +++ b/gm/sample_matrix_constant.cpp @@ -9,7 +9,7 @@ #include "include/effects/SkGradientShader.h" #include "src/core/SkMatrixProvider.h" #include "src/gpu/GrBitmapTextureMaker.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRenderTargetContextPriv.h" #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" #include "src/gpu/ops/GrFillRectOp.h" diff --git a/gm/sample_matrix_variable.cpp b/gm/sample_matrix_variable.cpp index 49324606ed..e28d90c73f 100644 --- a/gm/sample_matrix_variable.cpp +++ b/gm/sample_matrix_variable.cpp @@ -9,7 +9,7 @@ #include "include/effects/SkGradientShader.h" #include "src/core/SkMatrixProvider.h" #include "src/gpu/GrBitmapTextureMaker.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRenderTargetContextPriv.h" #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" #include "src/gpu/ops/GrFillRectOp.h" diff --git a/gm/samplelocations.cpp b/gm/samplelocations.cpp index 5c819802af..aa17327e54 100644 --- a/gm/samplelocations.cpp +++ b/gm/samplelocations.cpp @@ -22,7 +22,7 @@ #include "src/gpu/GrBuffer.h" #include "src/gpu/GrCaps.h" #include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGeometryProcessor.h" #include "src/gpu/GrMemoryPool.h" #include "src/gpu/GrOpFlushState.h" diff --git a/gm/swizzle.cpp b/gm/swizzle.cpp index 0dae77962e..e08079f87e 100644 --- a/gm/swizzle.cpp +++ b/gm/swizzle.cpp @@ -12,7 +12,7 @@ #include "include/core/SkRect.h" #include "include/core/SkTypes.h" #include "src/gpu/GrBitmapTextureMaker.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrFragmentProcessor.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrRenderTargetContextPriv.h" diff --git a/gm/tessellation.cpp b/gm/tessellation.cpp index 4e300aa510..9865ff97c3 100644 --- a/gm/tessellation.cpp +++ b/gm/tessellation.cpp @@ -8,7 +8,7 @@ #include "gm/gm.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrMemoryPool.h" #include "src/gpu/GrOpFlushState.h" #include "src/gpu/GrOpsRenderPass.h" diff --git a/gm/texelsubset.cpp b/gm/texelsubset.cpp index ae1cccd1bf..0d5506601d 100644 --- a/gm/texelsubset.cpp +++ b/gm/texelsubset.cpp @@ -20,7 +20,7 @@ #include "include/private/GrTypesPriv.h" #include "include/private/SkTArray.h" #include "src/gpu/GrBitmapTextureMaker.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrRenderTargetContextPriv.h" diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index 80d1887986..166f12c872 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -23,7 +23,7 @@ #include "include/core/SkYUVAIndex.h" #include "include/private/GrTypesPriv.h" #include "src/gpu/GrBitmapTextureMaker.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrFragmentProcessor.h" #include "src/gpu/GrPaint.h" #include "src/gpu/GrRenderTargetContext.h" diff --git a/gn/gpu.gni b/gn/gpu.gni index 28f18f816a..63acc5f6ec 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -72,8 +72,6 @@ skia_gpu_sources = [ "$_src/gpu/GrColorSpaceXform.cpp", "$_src/gpu/GrColorSpaceXform.h", "$_src/gpu/GrContext.cpp", - "$_src/gpu/GrContextPriv.cpp", - "$_src/gpu/GrContextPriv.h", "$_src/gpu/GrContextThreadSafeProxy.cpp", "$_src/gpu/GrContextThreadSafeProxyPriv.h", "$_src/gpu/GrContext_Base.cpp", @@ -88,6 +86,8 @@ skia_gpu_sources = [ "$_src/gpu/GrDeferredProxyUploader.h", "$_src/gpu/GrDeferredUpload.h", "$_src/gpu/GrDirectContext.cpp", + "$_src/gpu/GrDirectContextPriv.cpp", + "$_src/gpu/GrDirectContextPriv.h", "$_src/gpu/GrDistanceFieldGenFromVector.cpp", "$_src/gpu/GrDistanceFieldGenFromVector.h", "$_src/gpu/GrDrawOpAtlas.cpp", diff --git a/include/gpu/GrDirectContext.h b/include/gpu/GrDirectContext.h index 11048cb1b0..34350c5851 100644 --- a/include/gpu/GrDirectContext.h +++ b/include/gpu/GrDirectContext.h @@ -18,7 +18,7 @@ class GrAtlasManager; class GrBackendSemaphore; class GrClientMappedBufferManager; -class GrContextPriv; +class GrDirectContextPriv; class GrContextThreadSafeProxy; struct GrD3DBackendContext; class GrFragmentProcessor; @@ -718,8 +718,8 @@ public: #endif // Provides access to functions that aren't part of the public API. - GrContextPriv priv(); - const GrContextPriv priv() const; // NOLINT(readability-const-return-type) + GrDirectContextPriv priv(); + const GrDirectContextPriv priv() const; // NOLINT(readability-const-return-type) protected: GrDirectContext(GrBackendApi backend, const GrContextOptions& options); @@ -754,7 +754,7 @@ private: std::unique_ptr fSmallPathAtlasMgr; - friend class GrContextPriv; + friend class GrDirectContextPriv; using INHERITED = GrContext; }; diff --git a/samplecode/SampleAnimatedText.cpp b/samplecode/SampleAnimatedText.cpp index 97fecb776f..3bd475e7b6 100644 --- a/samplecode/SampleAnimatedText.cpp +++ b/samplecode/SampleAnimatedText.cpp @@ -18,7 +18,7 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #endif SkRandom gRand; diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp index c4f17ae273..a75f6fb15c 100644 --- a/samplecode/SampleCCPRGeometry.cpp +++ b/samplecode/SampleCCPRGeometry.cpp @@ -15,7 +15,7 @@ #include "include/gpu/GrDirectContext.h" #include "samplecode/Sample.h" #include "src/core/SkRectPriv.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrMemoryPool.h" #include "src/gpu/GrOnFlushResourceProvider.h" diff --git a/samplecode/SampleChineseFling.cpp b/samplecode/SampleChineseFling.cpp index a9acef6794..74c9ebcf03 100644 --- a/samplecode/SampleChineseFling.cpp +++ b/samplecode/SampleChineseFling.cpp @@ -18,7 +18,7 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #endif static sk_sp chinese_typeface() { diff --git a/src/core/SkDeferredDisplayList.cpp b/src/core/SkDeferredDisplayList.cpp index 97513ad845..23a33248bd 100644 --- a/src/core/SkDeferredDisplayList.cpp +++ b/src/core/SkDeferredDisplayList.cpp @@ -14,7 +14,7 @@ class SkSurfaceCharacterization; #if SK_SUPPORT_GPU -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRenderTask.h" #include "src/gpu/ccpr/GrCCPerOpsTaskPaths.h" #endif diff --git a/src/core/SkGlyphRunPainter.cpp b/src/core/SkGlyphRunPainter.cpp index 8be78d76ff..3aa6ccd543 100644 --- a/src/core/SkGlyphRunPainter.cpp +++ b/src/core/SkGlyphRunPainter.cpp @@ -11,7 +11,7 @@ #include "include/gpu/GrRecordingContext.h" #include "src/gpu/GrCaps.h" #include "src/gpu/GrColorInfo.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/SkGr.h" diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index 20643197fc..7d9dbfc576 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -24,7 +24,7 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" #include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrTextureProxy.h" diff --git a/src/effects/imagefilters/SkMorphologyImageFilter.cpp b/src/effects/imagefilters/SkMorphologyImageFilter.cpp index 9496474d63..15bfab473f 100644 --- a/src/effects/imagefilters/SkMorphologyImageFilter.cpp +++ b/src/effects/imagefilters/SkMorphologyImageFilter.cpp @@ -17,7 +17,7 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrTexture.h" diff --git a/src/gpu/GrAHardwareBufferImageGenerator.cpp b/src/gpu/GrAHardwareBufferImageGenerator.cpp index ee24c3db77..4ea5733a9f 100644 --- a/src/gpu/GrAHardwareBufferImageGenerator.cpp +++ b/src/gpu/GrAHardwareBufferImageGenerator.cpp @@ -22,7 +22,7 @@ #include "include/gpu/gl/GrGLTypes.h" #include "src/core/SkMessageBus.h" #include "src/gpu/GrAHardwareBufferUtils.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrResourceCache.h" diff --git a/src/gpu/GrAHardwareBufferUtils.cpp b/src/gpu/GrAHardwareBufferUtils.cpp index e0863778be..618cf65f45 100644 --- a/src/gpu/GrAHardwareBufferUtils.cpp +++ b/src/gpu/GrAHardwareBufferUtils.cpp @@ -21,7 +21,7 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/gl/GrGLTypes.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/gl/GrGLDefines.h" #include "src/gpu/gl/GrGLUtil.h" diff --git a/src/gpu/GrBackendTextureImageGenerator.cpp b/src/gpu/GrBackendTextureImageGenerator.cpp index 8a130bef53..771bb9eca8 100644 --- a/src/gpu/GrBackendTextureImageGenerator.cpp +++ b/src/gpu/GrBackendTextureImageGenerator.cpp @@ -9,7 +9,7 @@ #include "include/gpu/GrRecordingContext.h" #include "src/core/SkMessageBus.h" #include "src/gpu/GrBackendTextureImageGenerator.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRecordingContextPriv.h" diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp index 3343363f15..010d53f3d8 100644 --- a/src/gpu/GrBlurUtils.cpp +++ b/src/gpu/GrBlurUtils.cpp @@ -11,7 +11,7 @@ #include "include/gpu/GrRecordingContext.h" #include "src/gpu/GrBitmapTextureMaker.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrFixedClip.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRecordingContextPriv.h" diff --git a/src/gpu/GrBufferAllocPool.cpp b/src/gpu/GrBufferAllocPool.cpp index a07f789d7b..a8e26257d5 100644 --- a/src/gpu/GrBufferAllocPool.cpp +++ b/src/gpu/GrBufferAllocPool.cpp @@ -14,8 +14,8 @@ #include #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrCpuBuffer.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrGpuBuffer.h" #include "src/gpu/GrResourceProvider.h" diff --git a/src/gpu/GrClipStack.cpp b/src/gpu/GrClipStack.cpp index 5eb97dc2df..f572db22b4 100644 --- a/src/gpu/GrClipStack.cpp +++ b/src/gpu/GrClipStack.cpp @@ -12,8 +12,8 @@ #include "src/core/SkRectPriv.h" #include "src/core/SkTaskGroup.h" #include "src/gpu/GrClip.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDeferredProxyUploader.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrRenderTargetContextPriv.h" diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp index 6c65d7855c..df4899439d 100644 --- a/src/gpu/GrClipStackClip.cpp +++ b/src/gpu/GrClipStackClip.cpp @@ -14,8 +14,8 @@ #include "src/core/SkTraceEvent.h" #include "src/gpu/GrAppliedClip.h" #include "src/gpu/GrAttachment.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDeferredProxyUploader.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrGpuResourcePriv.h" #include "src/gpu/GrProxyProvider.h" diff --git a/src/gpu/GrDirectContext.cpp b/src/gpu/GrDirectContext.cpp index a0502d6061..3244ef6d69 100644 --- a/src/gpu/GrDirectContext.cpp +++ b/src/gpu/GrDirectContext.cpp @@ -12,8 +12,8 @@ #include "include/gpu/GrContextThreadSafeProxy.h" #include "src/core/SkTaskGroup.h" #include "src/gpu/GrClientMappedBufferManager.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrResourceProvider.h" diff --git a/src/gpu/GrContextPriv.cpp b/src/gpu/GrDirectContextPriv.cpp similarity index 67% rename from src/gpu/GrContextPriv.cpp rename to src/gpu/GrDirectContextPriv.cpp index 476da52301..c991d7d6f7 100644 --- a/src/gpu/GrContextPriv.cpp +++ b/src/gpu/GrDirectContextPriv.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "include/gpu/GrContextThreadSafeProxy.h" #include "include/gpu/GrDirectContext.h" @@ -30,21 +30,20 @@ SkASSERT(!(P) || !((P)->peekTexture()) || (P)->peekTexture()->getContext() == fContext) #define ASSERT_SINGLE_OWNER GR_ASSERT_SINGLE_OWNER(fContext->singleOwner()) #define RETURN_VALUE_IF_ABANDONED(value) if (fContext->abandoned()) { return (value); } -#define RETURN_IF_ABANDONED RETURN_VALUE_IF_ABANDONED(void) -sk_sp GrContextPriv::refCaps() const { +sk_sp GrDirectContextPriv::refCaps() const { return fContext->refCaps(); } -void GrContextPriv::addOnFlushCallbackObject(GrOnFlushCallbackObject* onFlushCBObject) { +void GrDirectContextPriv::addOnFlushCallbackObject(GrOnFlushCallbackObject* onFlushCBObject) { fContext->addOnFlushCallbackObject(onFlushCBObject); } -GrSemaphoresSubmitted GrContextPriv::flushSurfaces(GrSurfaceProxy* proxies[], int numProxies, - const GrFlushInfo& info) { +GrSemaphoresSubmitted GrDirectContextPriv::flushSurfaces(GrSurfaceProxy* proxies[], int numProxies, + const GrFlushInfo& info) { ASSERT_SINGLE_OWNER RETURN_VALUE_IF_ABANDONED(GrSemaphoresSubmitted::kNo) - GR_CREATE_TRACE_MARKER_CONTEXT("GrContextPriv", "flushSurfaces", fContext); + GR_CREATE_TRACE_MARKER_CONTEXT("GrDirectContextPriv", "flushSurfaces", fContext); SkASSERT(numProxies >= 0); SkASSERT(!numProxies || proxies); for (int i = 0; i < numProxies; ++i) { @@ -55,16 +54,16 @@ GrSemaphoresSubmitted GrContextPriv::flushSurfaces(GrSurfaceProxy* proxies[], in proxies, numProxies, SkSurface::BackendSurfaceAccess::kNoAccess, info, nullptr); } -void GrContextPriv::flushSurface(GrSurfaceProxy* proxy) { +void GrDirectContextPriv::flushSurface(GrSurfaceProxy* proxy) { this->flushSurfaces(proxy ? &proxy : nullptr, proxy ? 1 : 0, {}); } -void GrContextPriv::copyRenderTasksFromDDL(sk_sp ddl, - GrRenderTargetProxy* newDest) { +void GrDirectContextPriv::copyRenderTasksFromDDL(sk_sp ddl, + GrRenderTargetProxy* newDest) { fContext->drawingManager()->copyRenderTasksFromDDL(std::move(ddl), newDest); } -bool GrContextPriv::compile(const GrProgramDesc& desc, const GrProgramInfo& info) { +bool GrDirectContextPriv::compile(const GrProgramDesc& desc, const GrProgramInfo& info) { GrGpu* gpu = this->getGpu(); if (!gpu) { return false; @@ -77,79 +76,80 @@ bool GrContextPriv::compile(const GrProgramDesc& desc, const GrProgramInfo& info ////////////////////////////////////////////////////////////////////////////// #if GR_TEST_UTILS -void GrContextPriv::dumpCacheStats(SkString* out) const { +void GrDirectContextPriv::dumpCacheStats(SkString* out) const { #if GR_CACHE_STATS fContext->fResourceCache->dumpStats(out); #endif } -void GrContextPriv::dumpCacheStatsKeyValuePairs(SkTArray* keys, - SkTArray* values) const { +void GrDirectContextPriv::dumpCacheStatsKeyValuePairs(SkTArray* keys, + SkTArray* values) const { #if GR_CACHE_STATS fContext->fResourceCache->dumpStatsKeyValuePairs(keys, values); #endif } -void GrContextPriv::printCacheStats() const { +void GrDirectContextPriv::printCacheStats() const { SkString out; this->dumpCacheStats(&out); SkDebugf("%s", out.c_str()); } ///////////////////////////////////////////////// -void GrContextPriv::resetGpuStats() const { +void GrDirectContextPriv::resetGpuStats() const { #if GR_GPU_STATS fContext->fGpu->stats()->reset(); #endif } -void GrContextPriv::dumpGpuStats(SkString* out) const { +void GrDirectContextPriv::dumpGpuStats(SkString* out) const { #if GR_GPU_STATS return fContext->fGpu->stats()->dump(out); #endif } -void GrContextPriv::dumpGpuStatsKeyValuePairs(SkTArray* keys, - SkTArray* values) const { +void GrDirectContextPriv::dumpGpuStatsKeyValuePairs(SkTArray* keys, + SkTArray* values) const { #if GR_GPU_STATS return fContext->fGpu->stats()->dumpKeyValuePairs(keys, values); #endif } -void GrContextPriv::printGpuStats() const { +void GrDirectContextPriv::printGpuStats() const { SkString out; this->dumpGpuStats(&out); SkDebugf("%s", out.c_str()); } ///////////////////////////////////////////////// -void GrContextPriv::resetContextStats() const { +void GrDirectContextPriv::resetContextStats() const { #if GR_GPU_STATS fContext->stats()->reset(); #endif } -void GrContextPriv::dumpContextStats(SkString* out) const { +void GrDirectContextPriv::dumpContextStats(SkString* out) const { #if GR_GPU_STATS return fContext->stats()->dump(out); #endif } -void GrContextPriv::dumpContextStatsKeyValuePairs(SkTArray* keys, - SkTArray* values) const { +void GrDirectContextPriv::dumpContextStatsKeyValuePairs(SkTArray* keys, + SkTArray* values) const { #if GR_GPU_STATS return fContext->stats()->dumpKeyValuePairs(keys, values); #endif } -void GrContextPriv::printContextStats() const { +void GrDirectContextPriv::printContextStats() const { SkString out; this->dumpContextStats(&out); SkDebugf("%s", out.c_str()); } ///////////////////////////////////////////////// -sk_sp GrContextPriv::testingOnly_getFontAtlasImage(GrMaskFormat format, unsigned int index) { +sk_sp GrDirectContextPriv::testingOnly_getFontAtlasImage(GrMaskFormat format, + unsigned int index) { auto atlasManager = this->getAtlasManager(); if (!atlasManager) { return nullptr; @@ -168,26 +168,23 @@ sk_sp GrContextPriv::testingOnly_getFontAtlasImage(GrMaskFormat format, return image; } -void GrContextPriv::testingOnly_purgeAllUnlockedResources() { +void GrDirectContextPriv::testingOnly_purgeAllUnlockedResources() { fContext->fResourceCache->purgeAllUnlocked(); } -void GrContextPriv::testingOnly_flushAndRemoveOnFlushCallbackObject(GrOnFlushCallbackObject* cb) { - fContext->asDirectContext()->flushAndSubmit(); +void GrDirectContextPriv::testingOnly_flushAndRemoveOnFlushCallbackObject( + GrOnFlushCallbackObject* cb) { + fContext->flushAndSubmit(); fContext->drawingManager()->testingOnly_removeOnFlushCallbackObject(cb); } #endif -bool GrContextPriv::validPMUPMConversionExists() { +bool GrDirectContextPriv::validPMUPMConversionExists() { ASSERT_SINGLE_OWNER - // CONTEXT TODO: remove this downcast when this class becomes GrDirectContextPriv - auto direct = GrAsDirectContext(fContext); - SkASSERT(direct); - if (!fContext->fDidTestPMConversions) { fContext->fPMUPMConversionsRoundTrip = - GrConfigConversionEffect::TestForPreservingPMConversions(direct); + GrConfigConversionEffect::TestForPreservingPMConversions(fContext); fContext->fDidTestPMConversions = true; } @@ -195,7 +192,7 @@ bool GrContextPriv::validPMUPMConversionExists() { return fContext->fPMUPMConversionsRoundTrip; } -std::unique_ptr GrContextPriv::createPMToUPMEffect( +std::unique_ptr GrDirectContextPriv::createPMToUPMEffect( std::unique_ptr fp) { ASSERT_SINGLE_OWNER // We should have already called this->priv().validPMUPMConversionExists() in this case @@ -206,7 +203,7 @@ std::unique_ptr GrContextPriv::createPMToUPMEffect( return GrConfigConversionEffect::Make(std::move(fp), PMConversion::kToUnpremul); } -std::unique_ptr GrContextPriv::createUPMToPMEffect( +std::unique_ptr GrDirectContextPriv::createUPMToPMEffect( std::unique_ptr fp) { ASSERT_SINGLE_OWNER // We should have already called this->priv().validPMUPMConversionExists() in this case diff --git a/src/gpu/GrContextPriv.h b/src/gpu/GrDirectContextPriv.h similarity index 88% rename from src/gpu/GrContextPriv.h rename to src/gpu/GrDirectContextPriv.h index 5e6e2f737f..864bcba492 100644 --- a/src/gpu/GrContextPriv.h +++ b/src/gpu/GrDirectContextPriv.h @@ -5,8 +5,8 @@ * found in the LICENSE file. */ -#ifndef GrContextPriv_DEFINED -#define GrContextPriv_DEFINED +#ifndef GrDirectContextPriv_DEFINED +#define GrDirectContextPriv_DEFINED #include "include/gpu/GrDirectContext.h" @@ -22,11 +22,10 @@ class GrSurfaceProxy; class SkDeferredDisplayList; class SkTaskGroup; -/** TODO: Rename to GrDirectContextPriv. - Class that adds methods to GrDirectContext that are only intended for use internal to Skia. - This class is purely a privileged window into GrContext. It should never have additional +/** Class that adds methods to GrDirectContext that are only intended for use internal to Skia. + This class is purely a privileged window into GrDirectContext. It should never have additional data members or virtual methods. */ -class GrContextPriv { +class GrDirectContextPriv { public: // from GrContext_Base @@ -169,23 +168,24 @@ public: #endif private: - explicit GrContextPriv(GrDirectContext* context) : fContext(context) {} - GrContextPriv(const GrContextPriv&) = delete; - GrContextPriv& operator=(const GrContextPriv&) = delete; + explicit GrDirectContextPriv(GrDirectContext* context) : fContext(context) {} + GrDirectContextPriv(const GrDirectContextPriv&) = delete; + GrDirectContextPriv& operator=(const GrDirectContextPriv&) = delete; // No taking addresses of this type. - const GrContextPriv* operator&() const; - GrContextPriv* operator&(); + const GrDirectContextPriv* operator&() const; + GrDirectContextPriv* operator&(); GrDirectContext* fContext; friend class GrDirectContext; // to construct/copy this type. }; -inline GrContextPriv GrDirectContext::priv() { return GrContextPriv(this); } +inline GrDirectContextPriv GrDirectContext::priv() { return GrDirectContextPriv(this); } -inline const GrContextPriv GrDirectContext::priv() const { // NOLINT(readability-const-return-type) - return GrContextPriv(const_cast(this)); +// NOLINTNEXTLINE(readability-const-return-type) +inline const GrDirectContextPriv GrDirectContext::priv() const { + return GrDirectContextPriv(const_cast(this)); } #endif diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp index 9343bbed08..823f941f4e 100644 --- a/src/gpu/GrDrawingManager.cpp +++ b/src/gpu/GrDrawingManager.cpp @@ -17,8 +17,8 @@ #include "src/core/SkTTopoSort.h" #include "src/gpu/GrAuditTrail.h" #include "src/gpu/GrClientMappedBufferManager.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrCopyRenderTask.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrMemoryPool.h" #include "src/gpu/GrOnFlushResourceProvider.h" diff --git a/src/gpu/GrDrawingManager.h b/src/gpu/GrDrawingManager.h index d3ac74b611..10077f41e7 100644 --- a/src/gpu/GrDrawingManager.h +++ b/src/gpu/GrDrawingManager.h @@ -204,7 +204,7 @@ private: friend class GrContext; // access to: flush & cleanup friend class GrDirectContext; // access to: flush & cleanup - friend class GrContextPriv; // access to: flush + friend class GrDirectContextPriv; // access to: flush friend class GrOnFlushResourceProvider; // this is just a shallow wrapper around this class friend class GrRecordingContext; // access to: ctor friend class SkImage; // for access to: flush diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp index eaa42828ac..dd7df47d1b 100644 --- a/src/gpu/GrGpu.cpp +++ b/src/gpu/GrGpu.cpp @@ -18,8 +18,8 @@ #include "src/gpu/GrAuditTrail.h" #include "src/gpu/GrBackendUtils.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDataUtils.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpuResourcePriv.h" #include "src/gpu/GrNativeRect.h" #include "src/gpu/GrPathRendering.h" diff --git a/src/gpu/GrGpuResource.cpp b/src/gpu/GrGpuResource.cpp index a0d2e1b95a..6fb335711a 100644 --- a/src/gpu/GrGpuResource.cpp +++ b/src/gpu/GrGpuResource.cpp @@ -7,7 +7,7 @@ #include "include/core/SkTraceMemoryDump.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrGpuResource.h" #include "src/gpu/GrGpuResourcePriv.h" diff --git a/src/gpu/GrOnFlushResourceProvider.cpp b/src/gpu/GrOnFlushResourceProvider.cpp index 750096dfd7..cca7a5eff0 100644 --- a/src/gpu/GrOnFlushResourceProvider.cpp +++ b/src/gpu/GrOnFlushResourceProvider.cpp @@ -9,7 +9,7 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRecordingContextPriv.h" diff --git a/src/gpu/GrOpFlushState.cpp b/src/gpu/GrOpFlushState.cpp index 2201b65192..cd18e6b23b 100644 --- a/src/gpu/GrOpFlushState.cpp +++ b/src/gpu/GrOpFlushState.cpp @@ -9,8 +9,8 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkConvertPixels.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDataUtils.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawOpAtlas.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrImageInfo.h" diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp index 1fe6872273..4f5807cf6c 100644 --- a/src/gpu/GrPathRendererChain.cpp +++ b/src/gpu/GrPathRendererChain.cpp @@ -11,7 +11,7 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrShaderCaps.h" diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp index 9f50bbc2cb..5a562201c9 100644 --- a/src/gpu/GrProxyProvider.cpp +++ b/src/gpu/GrProxyProvider.cpp @@ -20,7 +20,7 @@ #include "src/core/SkMipmap.h" #include "src/core/SkTraceEvent.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageContextPriv.h" #include "src/gpu/GrRenderTarget.h" #include "src/gpu/GrRenderTargetContext.h" diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp index 8b1b19037b..c612f41e34 100644 --- a/src/gpu/GrRenderTargetContext.cpp +++ b/src/gpu/GrRenderTargetContext.cpp @@ -31,8 +31,8 @@ #include "src/gpu/GrCaps.h" #include "src/gpu/GrClip.h" #include "src/gpu/GrColor.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDataUtils.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrGpuResourcePriv.h" #include "src/gpu/GrImageContextPriv.h" diff --git a/src/gpu/GrRenderTargetProxy.cpp b/src/gpu/GrRenderTargetProxy.cpp index 96b57b4c0c..c5a0d81e5e 100644 --- a/src/gpu/GrRenderTargetProxy.cpp +++ b/src/gpu/GrRenderTargetProxy.cpp @@ -18,7 +18,7 @@ #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #endif // Deferred version diff --git a/src/gpu/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp index 3813d69012..c05bf1f769 100644 --- a/src/gpu/GrResourceCache.cpp +++ b/src/gpu/GrResourceCache.cpp @@ -16,7 +16,7 @@ #include "src/core/SkScopeExit.h" #include "src/core/SkTSort.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpuResourceCacheAccess.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrTexture.h" diff --git a/src/gpu/GrRingBuffer.cpp b/src/gpu/GrRingBuffer.cpp index 86b7904c1a..a64b799b8a 100644 --- a/src/gpu/GrRingBuffer.cpp +++ b/src/gpu/GrRingBuffer.cpp @@ -7,7 +7,7 @@ #include "src/gpu/GrRingBuffer.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrResourceProvider.h" diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp index 59e10a8689..ecceea61b6 100644 --- a/src/gpu/GrSoftwarePathRenderer.cpp +++ b/src/gpu/GrSoftwarePathRenderer.cpp @@ -14,8 +14,8 @@ #include "src/gpu/GrAuditTrail.h" #include "src/gpu/GrCaps.h" #include "src/gpu/GrClip.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDeferredProxyUploader.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpuResourcePriv.h" #include "src/gpu/GrOpFlushState.h" #include "src/gpu/GrProxyProvider.h" diff --git a/src/gpu/GrStagingBufferManager.cpp b/src/gpu/GrStagingBufferManager.cpp index 8c2d6e1863..93a1bd6d0c 100644 --- a/src/gpu/GrStagingBufferManager.cpp +++ b/src/gpu/GrStagingBufferManager.cpp @@ -8,7 +8,7 @@ #include "src/gpu/GrStagingBufferManager.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrResourceProvider.h" diff --git a/src/gpu/GrSurfaceContext.cpp b/src/gpu/GrSurfaceContext.cpp index d24d7aff13..ba64bc05ba 100644 --- a/src/gpu/GrSurfaceContext.cpp +++ b/src/gpu/GrSurfaceContext.cpp @@ -14,8 +14,8 @@ #include "src/core/SkAutoPixmapStorage.h" #include "src/core/SkYUVMath.h" #include "src/gpu/GrAuditTrail.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDataUtils.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrImageInfo.h" diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp index cda7dc3a9e..ba5c161a14 100644 --- a/src/gpu/GrSurfaceProxy.cpp +++ b/src/gpu/GrSurfaceProxy.cpp @@ -25,7 +25,7 @@ #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRenderTarget.h" static bool is_valid_lazy(const SkISize& dimensions, SkBackingFit fit) { diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp index e944846bfd..ae670c3901 100644 --- a/src/gpu/GrTexture.cpp +++ b/src/gpu/GrTexture.cpp @@ -17,7 +17,7 @@ #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #endif void GrTexture::markMipmapsDirty() { diff --git a/src/gpu/GrTextureProducer.cpp b/src/gpu/GrTextureProducer.cpp index fb7d041b4a..ecce150dd0 100644 --- a/src/gpu/GrTextureProducer.cpp +++ b/src/gpu/GrTextureProducer.cpp @@ -11,7 +11,7 @@ #include "src/core/SkMipmap.h" #include "src/core/SkRectPriv.h" #include "src/gpu/GrClip.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrRenderTargetContext.h" diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/GrTextureProxy.cpp index 6bd4761bb4..6836de3da2 100644 --- a/src/gpu/GrTextureProxy.cpp +++ b/src/gpu/GrTextureProxy.cpp @@ -9,8 +9,8 @@ #include "src/gpu/GrTextureProxyPriv.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDeferredProxyUploader.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrSurface.h" #include "src/gpu/GrTexture.h" diff --git a/src/gpu/GrTextureRenderTargetProxy.cpp b/src/gpu/GrTextureRenderTargetProxy.cpp index e0237748b5..8cf8266359 100644 --- a/src/gpu/GrTextureRenderTargetProxy.cpp +++ b/src/gpu/GrTextureRenderTargetProxy.cpp @@ -16,7 +16,7 @@ #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #endif // Deferred version diff --git a/src/gpu/GrThreadSafeCache.cpp b/src/gpu/GrThreadSafeCache.cpp index 0db8002dae..9e8a5cce25 100644 --- a/src/gpu/GrThreadSafeCache.cpp +++ b/src/gpu/GrThreadSafeCache.cpp @@ -8,7 +8,7 @@ #include "src/gpu/GrThreadSafeCache.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrResourceCache.h" diff --git a/src/gpu/d3d/GrD3DOpsRenderPass.cpp b/src/gpu/d3d/GrD3DOpsRenderPass.cpp index b70852130d..e4f264528a 100644 --- a/src/gpu/d3d/GrD3DOpsRenderPass.cpp +++ b/src/gpu/d3d/GrD3DOpsRenderPass.cpp @@ -22,7 +22,7 @@ #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #endif GrD3DOpsRenderPass::GrD3DOpsRenderPass(GrD3DGpu* gpu) : fGpu(gpu) {} diff --git a/src/gpu/d3d/GrD3DPipelineStateBuilder.cpp b/src/gpu/d3d/GrD3DPipelineStateBuilder.cpp index 5ad38b4729..3ec51becf0 100644 --- a/src/gpu/d3d/GrD3DPipelineStateBuilder.cpp +++ b/src/gpu/d3d/GrD3DPipelineStateBuilder.cpp @@ -13,7 +13,7 @@ #include "include/gpu/d3d/GrD3DTypes.h" #include "src/core/SkTraceEvent.h" #include "src/gpu/GrAutoLocaleSetter.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrPersistentCacheUtils.h" #include "src/gpu/GrShaderCaps.h" #include "src/gpu/GrShaderUtils.h" diff --git a/src/gpu/d3d/GrD3DResourceProvider.cpp b/src/gpu/d3d/GrD3DResourceProvider.cpp index 14ff7bd8c9..361bfdd8e7 100644 --- a/src/gpu/d3d/GrD3DResourceProvider.cpp +++ b/src/gpu/d3d/GrD3DResourceProvider.cpp @@ -10,7 +10,7 @@ #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" #include "include/private/SkOpts_spi.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/d3d/GrD3DBuffer.h" #include "src/gpu/d3d/GrD3DCommandList.h" #include "src/gpu/d3d/GrD3DGpu.h" diff --git a/src/gpu/d3d/GrD3DUtil.cpp b/src/gpu/d3d/GrD3DUtil.cpp index dd66b8355b..502e6fe6c3 100644 --- a/src/gpu/d3d/GrD3DUtil.cpp +++ b/src/gpu/d3d/GrD3DUtil.cpp @@ -7,8 +7,8 @@ #include "src/gpu/d3d/GrD3DUtil.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDataUtils.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/d3d/GrD3DGpu.h" #include "src/sksl/SkSLCompiler.h" diff --git a/src/gpu/dawn/GrDawnGpu.cpp b/src/gpu/dawn/GrDawnGpu.cpp index ab54c45e66..c70ed35623 100644 --- a/src/gpu/dawn/GrDawnGpu.cpp +++ b/src/gpu/dawn/GrDawnGpu.cpp @@ -12,8 +12,8 @@ #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkConvertPixels.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDataUtils.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGeometryProcessor.h" #include "src/gpu/GrGpuResourceCacheAccess.h" #include "src/gpu/GrPipeline.h" diff --git a/src/gpu/effects/GrConfigConversionEffect.fp b/src/gpu/effects/GrConfigConversionEffect.fp index 99604d5374..d79c74f26a 100644 --- a/src/gpu/effects/GrConfigConversionEffect.fp +++ b/src/gpu/effects/GrConfigConversionEffect.fp @@ -10,7 +10,7 @@ in fragmentProcessor inputFP; @header { #include "include/gpu/GrDirectContext.h" #include "src/gpu/GrBitmapTextureMaker.h" - #include "src/gpu/GrContextPriv.h" + #include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrRenderTargetContext.h" } diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp index 778dc2765c..ce2cc0faaa 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp +++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp @@ -8,7 +8,7 @@ #include "include/private/SkHalf.h" #include "src/gpu/GrBitmapTextureMaker.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrTexture.h" diff --git a/src/gpu/effects/GrRRectBlurEffect.fp b/src/gpu/effects/GrRRectBlurEffect.fp index 8230359113..df41c09921 100644 --- a/src/gpu/effects/GrRRectBlurEffect.fp +++ b/src/gpu/effects/GrRRectBlurEffect.fp @@ -42,7 +42,7 @@ uniform half blurRadius; #include "src/core/SkRRectPriv.h" #include "src/gpu/GrBitmapTextureMaker.h" #include "src/gpu/GrCaps.h" - #include "src/gpu/GrContextPriv.h" + #include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrPaint.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRecordingContextPriv.h" diff --git a/src/gpu/effects/generated/GrConfigConversionEffect.h b/src/gpu/effects/generated/GrConfigConversionEffect.h index 3e292ba3f0..e73348f9f5 100644 --- a/src/gpu/effects/generated/GrConfigConversionEffect.h +++ b/src/gpu/effects/generated/GrConfigConversionEffect.h @@ -16,7 +16,7 @@ #include "include/gpu/GrDirectContext.h" #include "src/gpu/GrBitmapTextureMaker.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrRenderTargetContext.h" diff --git a/src/gpu/effects/generated/GrRRectBlurEffect.cpp b/src/gpu/effects/generated/GrRRectBlurEffect.cpp index 4a5c62c4e5..e519971a0e 100644 --- a/src/gpu/effects/generated/GrRRectBlurEffect.cpp +++ b/src/gpu/effects/generated/GrRRectBlurEffect.cpp @@ -18,7 +18,7 @@ #include "src/core/SkRRectPriv.h" #include "src/gpu/GrBitmapTextureMaker.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrPaint.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRecordingContextPriv.h" diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index ad59a974d3..352028130f 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -21,9 +21,9 @@ #include "src/core/SkMipmap.h" #include "src/core/SkTraceEvent.h" #include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrCpuBuffer.h" #include "src/gpu/GrDataUtils.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpuResourcePriv.h" #include "src/gpu/GrPipeline.h" #include "src/gpu/GrProgramInfo.h" diff --git a/src/gpu/gl/GrGLGpuProgramCache.cpp b/src/gpu/gl/GrGLGpuProgramCache.cpp index 5fc828fdb4..9916aaa0ca 100644 --- a/src/gpu/gl/GrGLGpuProgramCache.cpp +++ b/src/gpu/gl/GrGLGpuProgramCache.cpp @@ -11,7 +11,7 @@ #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProcessor.h" #include "src/gpu/GrProgramDesc.h" #include "src/gpu/gl/builders/GrGLProgramBuilder.h" diff --git a/src/gpu/gl/GrGLOpsRenderPass.cpp b/src/gpu/gl/GrGLOpsRenderPass.cpp index 69e8d02c34..5df891a067 100644 --- a/src/gpu/gl/GrGLOpsRenderPass.cpp +++ b/src/gpu/gl/GrGLOpsRenderPass.cpp @@ -12,7 +12,7 @@ #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #endif #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X) diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp index 448fdaa312..d0e58cab5a 100644 --- a/src/gpu/gl/GrGLRenderTarget.cpp +++ b/src/gpu/gl/GrGLRenderTarget.cpp @@ -10,7 +10,7 @@ #include "include/core/SkTraceMemoryDump.h" #include "include/gpu/GrDirectContext.h" #include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpuResourcePriv.h" #include "src/gpu/gl/GrGLGpu.h" #include "src/gpu/gl/GrGLUtil.h" diff --git a/src/gpu/gl/GrGLTextureRenderTarget.cpp b/src/gpu/gl/GrGLTextureRenderTarget.cpp index 70ae72cb36..37837d026f 100644 --- a/src/gpu/gl/GrGLTextureRenderTarget.cpp +++ b/src/gpu/gl/GrGLTextureRenderTarget.cpp @@ -9,7 +9,7 @@ #include "include/core/SkTraceMemoryDump.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrTexture.h" #include "src/gpu/gl/GrGLGpu.h" diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index cbb0a44a91..e490a11028 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -14,7 +14,7 @@ #include "src/core/SkTraceEvent.h" #include "src/core/SkWriteBuffer.h" #include "src/gpu/GrAutoLocaleSetter.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrPersistentCacheUtils.h" #include "src/gpu/GrProgramDesc.h" #include "src/gpu/GrShaderCaps.h" diff --git a/src/gpu/mtl/GrMtlPipelineStateBuilder.mm b/src/gpu/mtl/GrMtlPipelineStateBuilder.mm index 5ce964f391..101b1403fa 100644 --- a/src/gpu/mtl/GrMtlPipelineStateBuilder.mm +++ b/src/gpu/mtl/GrMtlPipelineStateBuilder.mm @@ -11,7 +11,7 @@ #include "src/core/SkReadBuffer.h" #include "src/core/SkTraceEvent.h" #include "src/gpu/GrAutoLocaleSetter.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrPersistentCacheUtils.h" #include "src/gpu/GrRenderTarget.h" #include "src/gpu/GrShaderUtils.h" diff --git a/src/gpu/mtl/GrMtlResourceProvider.mm b/src/gpu/mtl/GrMtlResourceProvider.mm index 049ce003e7..cf92e5de01 100644 --- a/src/gpu/mtl/GrMtlResourceProvider.mm +++ b/src/gpu/mtl/GrMtlResourceProvider.mm @@ -9,7 +9,7 @@ #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/mtl/GrMtlCommandBuffer.h" #include "src/gpu/mtl/GrMtlGpu.h" #include "src/gpu/mtl/GrMtlPipelineState.h" diff --git a/src/gpu/text/GrAtlasManager.cpp b/src/gpu/text/GrAtlasManager.cpp index a7204dcd14..671f6d2cc2 100644 --- a/src/gpu/text/GrAtlasManager.cpp +++ b/src/gpu/text/GrAtlasManager.cpp @@ -207,7 +207,7 @@ void GrAtlasManager::addGlyphToBulkAndSetUseToken(GrDrawOpAtlas::BulkUseTokenUpd #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrSurfaceContext.h" #include "src/gpu/GrSurfaceProxy.h" #include "src/gpu/GrTextureProxy.h" diff --git a/src/gpu/vk/GrVkCommandPool.cpp b/src/gpu/vk/GrVkCommandPool.cpp index 0bcb7fe0e6..0a9db05e74 100644 --- a/src/gpu/vk/GrVkCommandPool.cpp +++ b/src/gpu/vk/GrVkCommandPool.cpp @@ -7,7 +7,7 @@ #include "src/gpu/vk/GrVkCommandPool.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/vk/GrVkCommandBuffer.h" #include "src/gpu/vk/GrVkGpu.h" diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index dc1abb1e34..2d8b271bdb 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp @@ -16,8 +16,8 @@ #include "src/core/SkConvertPixels.h" #include "src/core/SkMipmap.h" #include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDataUtils.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGeometryProcessor.h" #include "src/gpu/GrGpuResourceCacheAccess.h" #include "src/gpu/GrNativeRect.h" diff --git a/src/gpu/vk/GrVkOpsRenderPass.cpp b/src/gpu/vk/GrVkOpsRenderPass.cpp index de2f092ea3..8d7cf7e4e8 100644 --- a/src/gpu/vk/GrVkOpsRenderPass.cpp +++ b/src/gpu/vk/GrVkOpsRenderPass.cpp @@ -12,7 +12,7 @@ #include "include/gpu/GrBackendDrawableInfo.h" #include "include/gpu/GrDirectContext.h" #include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrOpFlushState.h" #include "src/gpu/GrPipeline.h" #include "src/gpu/GrRenderTarget.h" diff --git a/src/gpu/vk/GrVkPipelineStateBuilder.cpp b/src/gpu/vk/GrVkPipelineStateBuilder.cpp index 927fb2a971..ea1e4f3edb 100644 --- a/src/gpu/vk/GrVkPipelineStateBuilder.cpp +++ b/src/gpu/vk/GrVkPipelineStateBuilder.cpp @@ -10,7 +10,7 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkTraceEvent.h" #include "src/gpu/GrAutoLocaleSetter.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrPersistentCacheUtils.h" #include "src/gpu/GrShaderCaps.h" #include "src/gpu/GrShaderUtils.h" diff --git a/src/gpu/vk/GrVkPipelineStateCache.cpp b/src/gpu/vk/GrVkPipelineStateCache.cpp index 3a35afb5da..181a1a9809 100644 --- a/src/gpu/vk/GrVkPipelineStateCache.cpp +++ b/src/gpu/vk/GrVkPipelineStateCache.cpp @@ -9,7 +9,7 @@ #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkOpts.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProcessor.h" #include "src/gpu/GrRenderTarget.h" #include "src/gpu/GrStencilSettings.h" diff --git a/src/gpu/vk/GrVkRenderTarget.cpp b/src/gpu/vk/GrVkRenderTarget.cpp index 3f3f2f5ef2..2931c4a9c9 100644 --- a/src/gpu/vk/GrVkRenderTarget.cpp +++ b/src/gpu/vk/GrVkRenderTarget.cpp @@ -10,7 +10,7 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" #include "src/gpu/GrBackendSurfaceMutableStateImpl.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrResourceProvider.h" #include "src/gpu/vk/GrVkAttachment.h" #include "src/gpu/vk/GrVkCommandBuffer.h" diff --git a/src/gpu/vk/GrVkResourceProvider.cpp b/src/gpu/vk/GrVkResourceProvider.cpp index 37cd476e28..2902a7d292 100644 --- a/src/gpu/vk/GrVkResourceProvider.cpp +++ b/src/gpu/vk/GrVkResourceProvider.cpp @@ -9,7 +9,7 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkTaskGroup.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrSamplerState.h" #include "src/gpu/vk/GrVkCommandBuffer.h" #include "src/gpu/vk/GrVkCommandPool.h" diff --git a/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp b/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp index ed4d55ff45..40f19448c9 100644 --- a/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp +++ b/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp @@ -14,8 +14,8 @@ #include "include/gpu/GrRecordingContext.h" #include "include/gpu/vk/GrVkTypes.h" #include "src/core/SkSurfacePriv.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/SkGpuDevice.h" diff --git a/src/gpu/vk/GrVkTextureRenderTarget.cpp b/src/gpu/vk/GrVkTextureRenderTarget.cpp index 2af87b904e..2d0030254b 100644 --- a/src/gpu/vk/GrVkTextureRenderTarget.cpp +++ b/src/gpu/vk/GrVkTextureRenderTarget.cpp @@ -7,7 +7,7 @@ #include "src/gpu/vk/GrVkTextureRenderTarget.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrResourceProvider.h" #include "src/gpu/GrTexture.h" #include "src/gpu/vk/GrVkAttachment.h" diff --git a/src/gpu/vk/GrVkUtil.cpp b/src/gpu/vk/GrVkUtil.cpp index c626e1d219..9368495f2a 100644 --- a/src/gpu/vk/GrVkUtil.cpp +++ b/src/gpu/vk/GrVkUtil.cpp @@ -8,8 +8,8 @@ #include "src/gpu/vk/GrVkUtil.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDataUtils.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/vk/GrVkGpu.h" #include "src/sksl/SkSLCompiler.h" diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index c29ad81347..4ac87d2a18 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -30,7 +30,7 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageContextPriv.h" #include "src/image/SkImage_Gpu.h" #endif diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index b81d8543d1..f1d6d14c7b 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -26,7 +26,7 @@ #include "src/gpu/GrBitmapTextureMaker.h" #include "src/gpu/GrCaps.h" #include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrImageContextPriv.h" diff --git a/src/image/SkImage_GpuBase.cpp b/src/image/SkImage_GpuBase.cpp index 8ce0343a32..c61ccbaba2 100644 --- a/src/image/SkImage_GpuBase.cpp +++ b/src/image/SkImage_GpuBase.cpp @@ -13,7 +13,7 @@ #include "include/gpu/GrRecordingContext.h" #include "src/core/SkBitmapCache.h" #include "src/core/SkTLList.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageContextPriv.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrProxyProvider.h" diff --git a/src/image/SkImage_GpuYUVA.cpp b/src/image/SkImage_GpuYUVA.cpp index c7e71e3db1..0c38e9898d 100644 --- a/src/image/SkImage_GpuYUVA.cpp +++ b/src/image/SkImage_GpuYUVA.cpp @@ -18,7 +18,7 @@ #include "src/core/SkScopeExit.h" #include "src/gpu/GrBitmapTextureMaker.h" #include "src/gpu/GrClip.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrImageContextPriv.h" #include "src/gpu/GrRecordingContextPriv.h" diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp index da5e26ee7c..6556c2ec04 100644 --- a/src/image/SkSurface_Gpu.cpp +++ b/src/image/SkSurface_Gpu.cpp @@ -16,8 +16,8 @@ #include "src/core/SkImagePriv.h" #include "src/gpu/GrAHardwareBufferUtils.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrRenderTarget.h" #include "src/gpu/GrRenderTargetContextPriv.h" diff --git a/tests/AdvancedBlendTest.cpp b/tests/AdvancedBlendTest.cpp index aeb185ddc2..1f70a174b9 100644 --- a/tests/AdvancedBlendTest.cpp +++ b/tests/AdvancedBlendTest.cpp @@ -11,7 +11,7 @@ #include "include/private/SkColorData.h" #include "src/gpu/GrBlend.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrPaint.h" #include "src/gpu/GrProcessorAnalysis.h" #include "src/gpu/GrProcessorSet.h" diff --git a/tests/ApplyGammaTest.cpp b/tests/ApplyGammaTest.cpp index 904d94f6e7..a61b8a992a 100644 --- a/tests/ApplyGammaTest.cpp +++ b/tests/ApplyGammaTest.cpp @@ -22,7 +22,7 @@ #include "include/private/SkTemplates.h" #include "src/core/SkUtils.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrShaderCaps.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/BackendAllocationTest.cpp b/tests/BackendAllocationTest.cpp index 5f0032d6f6..e44d099aa5 100644 --- a/tests/BackendAllocationTest.cpp +++ b/tests/BackendAllocationTest.cpp @@ -10,7 +10,7 @@ #include "include/core/SkSurfaceCharacterization.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkAutoPixmapStorage.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/image/SkImage_Base.h" #include "tests/Test.h" #include "tests/TestUtils.h" diff --git a/tests/BackendSurfaceMutableStateTest.cpp b/tests/BackendSurfaceMutableStateTest.cpp index 8e822e25c9..e0f5c7fa6a 100644 --- a/tests/BackendSurfaceMutableStateTest.cpp +++ b/tests/BackendSurfaceMutableStateTest.cpp @@ -9,7 +9,7 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrTexture.h" #include "src/gpu/GrTextureProxy.h" #include "src/image/SkImage_Base.h" diff --git a/tests/BulkRectTest.cpp b/tests/BulkRectTest.cpp index 9645f8bfa4..b801154122 100644 --- a/tests/BulkRectTest.cpp +++ b/tests/BulkRectTest.cpp @@ -7,7 +7,7 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkBlendModePriv.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrRenderTargetContextPriv.h" diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp index 73ab6d1a3d..cd461cad62 100644 --- a/tests/ClipStackTest.cpp +++ b/tests/ClipStackTest.cpp @@ -31,7 +31,7 @@ #include "src/core/SkTLList.h" #include "src/gpu/GrClip.h" #include "src/gpu/GrClipStackClip.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrReducedClip.h" #include "src/gpu/GrResourceCache.h" #include "src/gpu/GrTexture.h" diff --git a/tests/CompressedBackendAllocationTest.cpp b/tests/CompressedBackendAllocationTest.cpp index bf687b788c..eb84ae7b1d 100644 --- a/tests/CompressedBackendAllocationTest.cpp +++ b/tests/CompressedBackendAllocationTest.cpp @@ -12,7 +12,7 @@ #include "src/core/SkCompressedDataUtils.h" #include "src/core/SkMipmap.h" #include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/image/SkImage_Base.h" #include "tests/Test.h" #include "tests/TestUtils.h" diff --git a/tests/CopySurfaceTest.cpp b/tests/CopySurfaceTest.cpp index 162d9328a6..7cba4d766f 100644 --- a/tests/CopySurfaceTest.cpp +++ b/tests/CopySurfaceTest.cpp @@ -16,7 +16,7 @@ #include "include/private/SkTemplates.h" #include "src/core/SkUtils.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrSurfaceContext.h" diff --git a/tests/DefaultPathRendererTest.cpp b/tests/DefaultPathRendererTest.cpp index 5ca463b7ba..da576118ea 100644 --- a/tests/DefaultPathRendererTest.cpp +++ b/tests/DefaultPathRendererTest.cpp @@ -23,7 +23,7 @@ #include "include/private/GrTypesPriv.h" #include "include/private/SkColorData.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrFragmentProcessor.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrPaint.h" diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp index 6e78cb69dd..e759199040 100644 --- a/tests/DeferredDisplayListTest.cpp +++ b/tests/DeferredDisplayListTest.cpp @@ -30,7 +30,7 @@ #include "include/private/GrTypesPriv.h" #include "src/core/SkDeferredDisplayListPriv.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrRenderTargetContext.h" diff --git a/tests/DrawOpAtlasTest.cpp b/tests/DrawOpAtlasTest.cpp index d3c84627fc..74bc7e8b93 100644 --- a/tests/DrawOpAtlasTest.cpp +++ b/tests/DrawOpAtlasTest.cpp @@ -21,8 +21,8 @@ #include "include/private/GrTypesPriv.h" #include "src/core/SkIPoint16.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDeferredUpload.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawOpAtlas.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrMemoryPool.h" diff --git a/tests/EGLImageTest.cpp b/tests/EGLImageTest.cpp index 34d3d57588..af06b1cc69 100644 --- a/tests/EGLImageTest.cpp +++ b/tests/EGLImageTest.cpp @@ -6,7 +6,7 @@ */ #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrShaderCaps.h" diff --git a/tests/FloatingPointTextureTest.cpp b/tests/FloatingPointTextureTest.cpp index 26117aca74..d7e1919c49 100644 --- a/tests/FloatingPointTextureTest.cpp +++ b/tests/FloatingPointTextureTest.cpp @@ -16,7 +16,7 @@ #include "include/gpu/GrDirectContext.h" #include "include/private/SkHalf.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrSurfaceContext.h" diff --git a/tests/GLBackendSurfaceTest.cpp b/tests/GLBackendSurfaceTest.cpp index 9cacd9b03f..b6fde94f31 100644 --- a/tests/GLBackendSurfaceTest.cpp +++ b/tests/GLBackendSurfaceTest.cpp @@ -17,7 +17,7 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/gl/GrGLTypes.h" #include "include/private/GrGLTypesPriv.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrTexture.h" #include "src/gpu/GrTextureProxy.h" #include "src/gpu/gl/GrGLCaps.h" diff --git a/tests/GrAHardwareBufferTest.cpp b/tests/GrAHardwareBufferTest.cpp index c5fb7c7911..b3550c8c64 100644 --- a/tests/GrAHardwareBufferTest.cpp +++ b/tests/GrAHardwareBufferTest.cpp @@ -16,7 +16,7 @@ #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" #include "src/gpu/GrAHardwareBufferImageGenerator.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/GrCCPRTest.cpp b/tests/GrCCPRTest.cpp index a684131c7b..163e28707f 100644 --- a/tests/GrCCPRTest.cpp +++ b/tests/GrCCPRTest.cpp @@ -16,7 +16,7 @@ #include "include/gpu/mock/GrMockTypes.h" #include "src/core/SkPathPriv.h" #include "src/gpu/GrClip.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrPaint.h" #include "src/gpu/GrPathRenderer.h" diff --git a/tests/GrClipStackTest.cpp b/tests/GrClipStackTest.cpp index c81fcae7ee..0c05f9242e 100644 --- a/tests/GrClipStackTest.cpp +++ b/tests/GrClipStackTest.cpp @@ -18,7 +18,7 @@ #include "src/core/SkMatrixProvider.h" #include "src/core/SkRRectPriv.h" #include "src/core/SkRectPriv.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRenderTargetContext.h" diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp index 32fa734c6a..0ddb69a3b0 100644 --- a/tests/GrContextFactoryTest.cpp +++ b/tests/GrContextFactoryTest.cpp @@ -10,7 +10,7 @@ #include "include/core/SkExecutor.h" #include "include/gpu/GrDirectContext.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/GrFinishedFlushTest.cpp b/tests/GrFinishedFlushTest.cpp index 40d3ef9874..481c06d2bb 100644 --- a/tests/GrFinishedFlushTest.cpp +++ b/tests/GrFinishedFlushTest.cpp @@ -11,7 +11,7 @@ #include "include/core/SkCanvas.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" using namespace sk_gpu_test; diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp index 03bd645c30..46ccd752f9 100644 --- a/tests/GrMeshTest.cpp +++ b/tests/GrMeshTest.cpp @@ -14,7 +14,7 @@ #include "include/gpu/GrDirectContext.h" #include "include/private/GrResourceKey.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGeometryProcessor.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrMemoryPool.h" diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp index 6a5199e7c0..104449c2c8 100644 --- a/tests/GrMipMappedTest.cpp +++ b/tests/GrMipMappedTest.cpp @@ -13,7 +13,7 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" #include "src/gpu/GrBackendTextureImageGenerator.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrProxyProvider.h" diff --git a/tests/GrOpListFlushTest.cpp b/tests/GrOpListFlushTest.cpp index 9bfc889e39..723db58633 100644 --- a/tests/GrOpListFlushTest.cpp +++ b/tests/GrOpListFlushTest.cpp @@ -8,7 +8,7 @@ #include "include/core/SkCanvas.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "tests/Test.h" diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp index 46e61499a9..c66bbb5f60 100644 --- a/tests/GrPipelineDynamicStateTest.cpp +++ b/tests/GrPipelineDynamicStateTest.cpp @@ -11,7 +11,7 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" #include "src/gpu/GrColor.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGeometryProcessor.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrMemoryPool.h" diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index 9eb370dda2..c7f2a44630 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -10,7 +10,7 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrXferProcessor.h" diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp index 05dd427014..49078e101e 100644 --- a/tests/GrSurfaceTest.cpp +++ b/tests/GrSurfaceTest.cpp @@ -12,7 +12,7 @@ #include "src/core/SkCompressedDataUtils.h" #include "src/gpu/GrBackendUtils.h" #include "src/gpu/GrBitmapTextureMaker.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrProxyProvider.h" diff --git a/tests/GrTestingBackendTextureUploadTest.cpp b/tests/GrTestingBackendTextureUploadTest.cpp index 5aa1c5055a..6229b2209e 100644 --- a/tests/GrTestingBackendTextureUploadTest.cpp +++ b/tests/GrTestingBackendTextureUploadTest.cpp @@ -7,7 +7,7 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkAutoPixmapStorage.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrSurfaceContext.h" diff --git a/tests/GrTextureMipMapInvalidationTest.cpp b/tests/GrTextureMipMapInvalidationTest.cpp index f041e84202..6d5441f3cd 100644 --- a/tests/GrTextureMipMapInvalidationTest.cpp +++ b/tests/GrTextureMipMapInvalidationTest.cpp @@ -8,7 +8,7 @@ #include "include/core/SkCanvas.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrTexture.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_GpuBase.h" diff --git a/tests/GrThreadSafeCacheTest.cpp b/tests/GrThreadSafeCacheTest.cpp index 0f0a0c2ea7..9f39daa504 100644 --- a/tests/GrThreadSafeCacheTest.cpp +++ b/tests/GrThreadSafeCacheTest.cpp @@ -8,7 +8,7 @@ #include "include/core/SkCanvas.h" #include "include/core/SkDeferredDisplayListRecorder.h" #include "include/core/SkSurfaceCharacterization.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrRenderTargetContext.h" diff --git a/tests/GrUploadPixelsTests.cpp b/tests/GrUploadPixelsTests.cpp index 10753d0cf8..be92f07d6f 100644 --- a/tests/GrUploadPixelsTests.cpp +++ b/tests/GrUploadPixelsTests.cpp @@ -10,7 +10,7 @@ #include "include/core/SkTypes.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrSurfaceContext.h" #include "src/gpu/GrSurfaceProxy.h" diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp index 3af8b767dc..6f7cb647bf 100644 --- a/tests/ImageFilterCacheTest.cpp +++ b/tests/ImageFilterCacheTest.cpp @@ -200,7 +200,7 @@ DEF_TEST(ImageFilterCache_ImageBackedRaster, reporter) { #include "include/gpu/GrDirectContext.h" #include "src/gpu/GrBitmapTextureMaker.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrResourceProvider.h" #include "src/gpu/GrSurfaceProxyPriv.h" diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 92222bc5bf..a9b048275e 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -26,7 +26,7 @@ #include "src/core/SkColorSpacePriv.h" #include "src/core/SkImagePriv.h" #include "src/core/SkUtils.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrImageContextPriv.h" #include "src/gpu/GrRecordingContextPriv.h" diff --git a/tests/LazyProxyTest.cpp b/tests/LazyProxyTest.cpp index 2f5db6e685..5425eff881 100644 --- a/tests/LazyProxyTest.cpp +++ b/tests/LazyProxyTest.cpp @@ -10,7 +10,7 @@ #include "include/gpu/mock/GrMockTypes.h" #include "src/core/SkRectPriv.h" #include "src/gpu/GrClip.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrMemoryPool.h" #include "src/gpu/GrOnFlushResourceProvider.h" #include "src/gpu/GrProxyProvider.h" diff --git a/tests/MtlBackendAllocationTest.mm b/tests/MtlBackendAllocationTest.mm index 249b800fd4..11f44874d5 100644 --- a/tests/MtlBackendAllocationTest.mm +++ b/tests/MtlBackendAllocationTest.mm @@ -6,7 +6,7 @@ */ #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "tests/Test.h" #import diff --git a/tests/MtlCopySurfaceTest.mm b/tests/MtlCopySurfaceTest.mm index b9715db500..7afd14217c 100644 --- a/tests/MtlCopySurfaceTest.mm +++ b/tests/MtlCopySurfaceTest.mm @@ -7,7 +7,7 @@ #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/mtl/GrMtlGpu.h" #include "tests/Test.h" diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp index 5bbfbc83bd..6dd0fad92c 100644 --- a/tests/OnFlushCallbackTest.cpp +++ b/tests/OnFlushCallbackTest.cpp @@ -11,8 +11,8 @@ #include "include/gpu/GrBackendSemaphore.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkPointPriv.h" -#include "src/gpu/GrContextPriv.h" #include "src/gpu/GrDefaultGeoProcFactory.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrOnFlushResourceProvider.h" #include "src/gpu/GrProgramInfo.h" diff --git a/tests/OpChainTest.cpp b/tests/OpChainTest.cpp index 1173f157a9..db312574b1 100644 --- a/tests/OpChainTest.cpp +++ b/tests/OpChainTest.cpp @@ -6,7 +6,7 @@ */ #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrMemoryPool.h" #include "src/gpu/GrOpFlushState.h" #include "src/gpu/GrOpsTask.h" diff --git a/tests/PackedConfigsTextureTest.cpp b/tests/PackedConfigsTextureTest.cpp index d4136521f9..41fcea7967 100644 --- a/tests/PackedConfigsTextureTest.cpp +++ b/tests/PackedConfigsTextureTest.cpp @@ -14,7 +14,7 @@ #include "tests/Test.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrSurfaceContext.h" diff --git a/tests/PathRendererCacheTests.cpp b/tests/PathRendererCacheTests.cpp index d09dc5f039..f7af66670b 100644 --- a/tests/PathRendererCacheTests.cpp +++ b/tests/PathRendererCacheTests.cpp @@ -10,7 +10,7 @@ #include "include/core/SkPath.h" #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrResourceCache.h" diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp index 2c3c00649c..6fee118397 100644 --- a/tests/PrimitiveProcessorTest.cpp +++ b/tests/PrimitiveProcessorTest.cpp @@ -15,7 +15,7 @@ #include "include/core/SkString.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkPointPriv.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGeometryProcessor.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrMemoryPool.h" diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp index 99f46eb06b..70cfef8abd 100644 --- a/tests/ProcessorTest.cpp +++ b/tests/ProcessorTest.cpp @@ -10,7 +10,7 @@ #include "include/gpu/GrDirectContext.h" #include "src/gpu/GrBitmapTextureMaker.h" #include "src/gpu/GrClip.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpuResource.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrMemoryPool.h" diff --git a/tests/ProgramsTest.cpp b/tests/ProgramsTest.cpp index 013e698550..0fb345a97e 100644 --- a/tests/ProgramsTest.cpp +++ b/tests/ProgramsTest.cpp @@ -13,7 +13,7 @@ #include "include/private/SkChecksum.h" #include "include/utils/SkRandom.h" #include "src/gpu/GrAutoLocaleSetter.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawOpTest.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrPipeline.h" diff --git a/tests/PromiseImageTest.cpp b/tests/PromiseImageTest.cpp index 4b73db0514..18379c8819 100644 --- a/tests/PromiseImageTest.cpp +++ b/tests/PromiseImageTest.cpp @@ -11,7 +11,7 @@ #include "include/core/SkPromiseImageTexture.h" #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrTexture.h" #include "src/image/SkImage_Gpu.h" diff --git a/tests/ProxyConversionTest.cpp b/tests/ProxyConversionTest.cpp index a249f93c10..8df901597b 100644 --- a/tests/ProxyConversionTest.cpp +++ b/tests/ProxyConversionTest.cpp @@ -11,7 +11,7 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRenderTarget.h" diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp index 8b258b4d15..9ef2deb597 100644 --- a/tests/ProxyRefTest.cpp +++ b/tests/ProxyRefTest.cpp @@ -10,7 +10,7 @@ #include "tests/Test.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrRenderTargetProxy.h" diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp index 09de88b773..767cb30d5a 100644 --- a/tests/ProxyTest.cpp +++ b/tests/ProxyTest.cpp @@ -9,7 +9,7 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRenderTarget.h" diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp index f82bfd41b3..d6e6a7514e 100644 --- a/tests/ReadPixelsTest.cpp +++ b/tests/ReadPixelsTest.cpp @@ -17,7 +17,7 @@ #include "src/core/SkAutoPixmapStorage.h" #include "src/core/SkConvertPixels.h" #include "src/core/SkMathPriv.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrSurfaceContext.h" #include "tests/Test.h" diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp index 1891dabb57..acb5cfdbd4 100644 --- a/tests/ReadWriteAlphaTest.cpp +++ b/tests/ReadWriteAlphaTest.cpp @@ -12,7 +12,7 @@ #include "include/gpu/GrDirectContext.h" #include "include/private/SkTo.h" #include "src/gpu/GrBitmapTextureMaker.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrSurfaceContext.h" diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp index c4ef0cfd9b..d2e3e68e63 100644 --- a/tests/RectangleTextureTest.cpp +++ b/tests/RectangleTextureTest.cpp @@ -9,7 +9,7 @@ #include "tests/TestUtils.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrSurfaceContextPriv.h" diff --git a/tests/RenderTargetContextTest.cpp b/tests/RenderTargetContextTest.cpp index 3b02881b5e..d07d392145 100644 --- a/tests/RenderTargetContextTest.cpp +++ b/tests/RenderTargetContextTest.cpp @@ -10,7 +10,7 @@ #include "tests/Test.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrTextureProxy.h" diff --git a/tests/RepeatedClippedBlurTest.cpp b/tests/RepeatedClippedBlurTest.cpp index 1161ce77b5..ccaf4f173c 100644 --- a/tests/RepeatedClippedBlurTest.cpp +++ b/tests/RepeatedClippedBlurTest.cpp @@ -9,7 +9,7 @@ #include "include/core/SkSurface.h" #include "include/effects/SkImageFilters.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrResourceCache.h" #include "tests/Test.h" diff --git a/tests/ResourceAllocatorTest.cpp b/tests/ResourceAllocatorTest.cpp index 1d1e7e1f4b..8862292cec 100644 --- a/tests/ResourceAllocatorTest.cpp +++ b/tests/ResourceAllocatorTest.cpp @@ -8,7 +8,7 @@ #include "include/core/SkCanvas.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrResourceAllocator.h" diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp index aa9913adbf..4c47ba6863 100644 --- a/tests/ResourceCacheTest.cpp +++ b/tests/ResourceCacheTest.cpp @@ -12,7 +12,7 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkMessageBus.h" #include "src/core/SkMipmap.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrGpuResourceCacheAccess.h" #include "src/gpu/GrGpuResourcePriv.h" diff --git a/tests/SRGBReadWritePixelsTest.cpp b/tests/SRGBReadWritePixelsTest.cpp index 01b4eebd72..afc11a00cd 100644 --- a/tests/SRGBReadWritePixelsTest.cpp +++ b/tests/SRGBReadWritePixelsTest.cpp @@ -9,7 +9,7 @@ #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrSurfaceContext.h" diff --git a/tests/SkRemoteGlyphCacheTest.cpp b/tests/SkRemoteGlyphCacheTest.cpp index eb5edb7bd3..a13b91096d 100644 --- a/tests/SkRemoteGlyphCacheTest.cpp +++ b/tests/SkRemoteGlyphCacheTest.cpp @@ -17,7 +17,7 @@ #include "src/core/SkStrikeSpec.h" #include "src/core/SkSurfacePriv.h" #include "src/core/SkTypeface_remote.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/text/GrSDFTOptions.h" #include "tests/Test.h" diff --git a/tests/Skbug6653.cpp b/tests/Skbug6653.cpp index 2aae1db498..18fce9729e 100644 --- a/tests/Skbug6653.cpp +++ b/tests/Skbug6653.cpp @@ -9,7 +9,7 @@ #include "include/core/SkSurface.h" #include "include/core/SkTypes.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "tests/Test.h" static SkBitmap read_pixels(sk_sp surface, SkColor initColor) { diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp index 2276746db0..0bc151860d 100644 --- a/tests/SpecialImageTest.cpp +++ b/tests/SpecialImageTest.cpp @@ -16,7 +16,7 @@ #include "src/core/SkSpecialImage.h" #include "src/core/SkSpecialSurface.h" #include "src/gpu/GrBitmapTextureMaker.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrSurfaceProxy.h" #include "src/gpu/GrTextureProxy.h" diff --git a/tests/SpecialSurfaceTest.cpp b/tests/SpecialSurfaceTest.cpp index c3f185eb10..cf4daf3990 100644 --- a/tests/SpecialSurfaceTest.cpp +++ b/tests/SpecialSurfaceTest.cpp @@ -11,7 +11,7 @@ #include "src/core/SkSpecialImage.h" #include "src/core/SkSpecialSurface.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/SkGr.h" #include "tests/Test.h" diff --git a/tests/SurfaceSemaphoreTest.cpp b/tests/SurfaceSemaphoreTest.cpp index e1509cd480..d13ce5d09c 100644 --- a/tests/SurfaceSemaphoreTest.cpp +++ b/tests/SurfaceSemaphoreTest.cpp @@ -11,7 +11,7 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index c4fc29b489..07cf7b3254 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -17,7 +17,7 @@ #include "src/core/SkAutoPixmapStorage.h" #include "src/core/SkDevice.h" #include "src/core/SkUtils.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrGpuResourcePriv.h" #include "src/gpu/GrImageInfo.h" diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp index 6c01b4f004..497d39f2e6 100644 --- a/tests/TestUtils.cpp +++ b/tests/TestUtils.cpp @@ -10,7 +10,7 @@ #include "include/encode/SkPngEncoder.h" #include "include/utils/SkBase64.h" #include "src/core/SkUtils.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrImageInfo.h" diff --git a/tests/TextBlobCacheTest.cpp b/tests/TextBlobCacheTest.cpp index 19d0113ada..28951d1f1b 100644 --- a/tests/TextBlobCacheTest.cpp +++ b/tests/TextBlobCacheTest.cpp @@ -19,7 +19,7 @@ #include "include/core/SkTypeface.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkGlyphRun.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "tools/fonts/RandomScalerContext.h" #ifdef SK_BUILD_FOR_WIN @@ -28,7 +28,7 @@ #include "tests/Test.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/text/GrAtlasManager.h" #include "src/gpu/text/GrTextBlobCache.h" diff --git a/tests/TextureBindingsResetTest.cpp b/tests/TextureBindingsResetTest.cpp index 6977b29ce6..8b3a07d19c 100644 --- a/tests/TextureBindingsResetTest.cpp +++ b/tests/TextureBindingsResetTest.cpp @@ -7,7 +7,7 @@ #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/gl/GrGLDefines.h" #include "src/gpu/gl/GrGLGpu.h" #include "src/gpu/gl/GrGLUtil.h" diff --git a/tests/TextureOpTest.cpp b/tests/TextureOpTest.cpp index ddac1c2a85..c9c933cc88 100644 --- a/tests/TextureOpTest.cpp +++ b/tests/TextureOpTest.cpp @@ -7,7 +7,7 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/ops/GrTextureOp.h" diff --git a/tests/TextureProxyTest.cpp b/tests/TextureProxyTest.cpp index dff9e5266d..c1c14d61a6 100644 --- a/tests/TextureProxyTest.cpp +++ b/tests/TextureProxyTest.cpp @@ -12,7 +12,7 @@ #include "include/core/SkImage.h" #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/GrResourceCache.h" diff --git a/tests/TraceMemoryDumpTest.cpp b/tests/TraceMemoryDumpTest.cpp index cee1530352..cc84357a22 100644 --- a/tests/TraceMemoryDumpTest.cpp +++ b/tests/TraceMemoryDumpTest.cpp @@ -10,7 +10,7 @@ #include "tests/Test.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRenderTarget.h" #include "src/gpu/GrTexture.h" #ifdef SK_GL diff --git a/tests/TransferPixelsTest.cpp b/tests/TransferPixelsTest.cpp index 6d8c062e95..4c369584e7 100644 --- a/tests/TransferPixelsTest.cpp +++ b/tests/TransferPixelsTest.cpp @@ -11,7 +11,7 @@ #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrImageInfo.h" #include "src/gpu/GrResourceProvider.h" diff --git a/tests/TriangulatingPathRendererTests.cpp b/tests/TriangulatingPathRendererTests.cpp index 9c8488dc91..fb8921516f 100644 --- a/tests/TriangulatingPathRendererTests.cpp +++ b/tests/TriangulatingPathRendererTests.cpp @@ -10,7 +10,7 @@ #include "include/core/SkPath.h" #include "include/effects/SkGradientShader.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRenderTargetContext.h" #include "src/gpu/GrStyle.h" #include "src/gpu/effects/GrPorterDuffXferProcessor.h" diff --git a/tests/VkDrawableTest.cpp b/tests/VkDrawableTest.cpp index 1feaff2c6c..885ac4afb4 100644 --- a/tests/VkDrawableTest.cpp +++ b/tests/VkDrawableTest.cpp @@ -17,7 +17,7 @@ #include "include/core/SkSurface.h" #include "include/gpu/GrBackendDrawableInfo.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/vk/GrVkGpu.h" #include "src/gpu/vk/GrVkInterface.h" #include "src/gpu/vk/GrVkMemory.h" diff --git a/tests/VkHardwareBufferTest.cpp b/tests/VkHardwareBufferTest.cpp index 1537ba8dbb..4352d10541 100644 --- a/tests/VkHardwareBufferTest.cpp +++ b/tests/VkHardwareBufferTest.cpp @@ -19,7 +19,7 @@ #include "include/gpu/vk/GrVkBackendContext.h" #include "include/gpu/vk/GrVkExtensions.h" #include "src/core/SkAutoMalloc.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrProxyProvider.h" #include "src/gpu/SkGr.h" diff --git a/tests/VkWrapTests.cpp b/tests/VkWrapTests.cpp index 7f163f8a42..0ac75e3857 100644 --- a/tests/VkWrapTests.cpp +++ b/tests/VkWrapTests.cpp @@ -15,7 +15,7 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/vk/GrVkTypes.h" #include "include/gpu/vk/GrVkVulkan.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRenderTarget.h" #include "src/gpu/GrTexture.h" #include "src/gpu/vk/GrVkCaps.h" diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp index 221dc23cb9..2f6af23277 100644 --- a/tests/WritePixelsTest.cpp +++ b/tests/WritePixelsTest.cpp @@ -12,7 +12,7 @@ #include "include/private/SkColorData.h" #include "include/private/SkImageInfoPriv.h" #include "src/core/SkMathPriv.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrProxyProvider.h" #include "tests/Test.h" diff --git a/tools/DDLPromiseImageHelper.cpp b/tools/DDLPromiseImageHelper.cpp index 11827c42f2..9980864978 100644 --- a/tools/DDLPromiseImageHelper.cpp +++ b/tools/DDLPromiseImageHelper.cpp @@ -17,7 +17,7 @@ #include "src/core/SkCachedData.h" #include "src/core/SkMipmap.h" #include "src/core/SkTaskGroup.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_GpuYUVA.h" diff --git a/tools/DDLTileHelper.cpp b/tools/DDLTileHelper.cpp index 8783bfd7ae..fbea4ce660 100644 --- a/tools/DDLTileHelper.cpp +++ b/tools/DDLTileHelper.cpp @@ -15,7 +15,7 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkDeferredDisplayListPriv.h" #include "src/core/SkTaskGroup.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/image/SkImage_Gpu.h" #include "tools/DDLPromiseImageHelper.h" diff --git a/tools/fiddle/fiddle_main.cpp b/tools/fiddle/fiddle_main.cpp index e749d9d780..0c59132959 100644 --- a/tools/fiddle/fiddle_main.cpp +++ b/tools/fiddle/fiddle_main.cpp @@ -23,7 +23,7 @@ static DEFINE_double(frame, 1.0, "A double value in [0, 1] that specifies the point in animation to draw."); #include "include/gpu/GrBackendSurface.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrRenderTarget.h" #include "tools/gpu/gl/GLTestContext.h" diff --git a/tools/fm/fm.cpp b/tools/fm/fm.cpp index a18279f4b3..cf20fabb80 100644 --- a/tools/fm/fm.cpp +++ b/tools/fm/fm.cpp @@ -16,7 +16,7 @@ #include "src/core/SkColorSpacePriv.h" #include "src/core/SkMD5.h" #include "src/core/SkOSFile.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/utils/SkOSPath.h" #include "tests/Test.h" diff --git a/tools/gpu/BackendSurfaceFactory.cpp b/tools/gpu/BackendSurfaceFactory.cpp index 2c24760b9e..bbb13ea545 100644 --- a/tools/gpu/BackendSurfaceFactory.cpp +++ b/tools/gpu/BackendSurfaceFactory.cpp @@ -9,7 +9,7 @@ #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "tools/gpu/ManagedBackendTexture.h" diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp index c6e18e4841..c03e72cbbb 100644 --- a/tools/gpu/GrContextFactory.cpp +++ b/tools/gpu/GrContextFactory.cpp @@ -7,7 +7,7 @@ */ #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "tools/gpu/GrContextFactory.h" #ifdef SK_GL #include "tools/gpu/gl/GLTestContext.h" diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index 117a267569..0ebbfe2711 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -12,7 +12,7 @@ #include "include/private/SkTo.h" #include "src/core/SkMathPriv.h" #include "src/gpu/GrClip.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawOpAtlas.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrGpu.h" diff --git a/tools/gpu/ProxyUtils.cpp b/tools/gpu/ProxyUtils.cpp index 06b2e8ad91..72022e6870 100644 --- a/tools/gpu/ProxyUtils.cpp +++ b/tools/gpu/ProxyUtils.cpp @@ -8,7 +8,7 @@ #include "include/core/SkColor.h" #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrDrawingManager.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrImageInfo.h" diff --git a/tools/gpu/YUVUtils.cpp b/tools/gpu/YUVUtils.cpp index c2e2288cf5..4e8ad248e5 100644 --- a/tools/gpu/YUVUtils.cpp +++ b/tools/gpu/YUVUtils.cpp @@ -10,7 +10,7 @@ #include "include/core/SkData.h" #include "include/gpu/GrRecordingContext.h" #include "src/codec/SkCodecImageGenerator.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrRecordingContextPriv.h" namespace sk_gpu_test { diff --git a/tools/gpu/vk/VkYcbcrSamplerHelper.cpp b/tools/gpu/vk/VkYcbcrSamplerHelper.cpp index f083245488..82e688c5c1 100644 --- a/tools/gpu/vk/VkYcbcrSamplerHelper.cpp +++ b/tools/gpu/vk/VkYcbcrSamplerHelper.cpp @@ -10,7 +10,7 @@ #ifdef SK_VULKAN #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/vk/GrVkGpu.h" #include "src/gpu/vk/GrVkUtil.h" diff --git a/tools/sk_app/GLWindowContext.cpp b/tools/sk_app/GLWindowContext.cpp index e30a4b686d..ba658af3cd 100644 --- a/tools/sk_app/GLWindowContext.cpp +++ b/tools/sk_app/GLWindowContext.cpp @@ -12,7 +12,7 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkMathPriv.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/gl/GrGLDefines.h" #include "src/gpu/gl/GrGLUtil.h" #include "src/image/SkImage_Base.h" diff --git a/tools/sk_app/MetalWindowContext.mm b/tools/sk_app/MetalWindowContext.mm index 8cbfeb3fe5..bdb1699600 100644 --- a/tools/sk_app/MetalWindowContext.mm +++ b/tools/sk_app/MetalWindowContext.mm @@ -12,7 +12,7 @@ #include "include/gpu/mtl/GrMtlTypes.h" #include "src/core/SkMathPriv.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/image/SkImage_Base.h" #include "tools/sk_app/MetalWindowContext.h" diff --git a/tools/skpbench/skpbench.cpp b/tools/skpbench/skpbench.cpp index 15d8cbb19d..8300d34b65 100644 --- a/tools/skpbench/skpbench.cpp +++ b/tools/skpbench/skpbench.cpp @@ -18,7 +18,7 @@ #include "src/core/SkOSFile.h" #include "src/core/SkTaskGroup.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/SkGr.h" #include "src/utils/SkMultiPictureDocument.h" #include "src/utils/SkOSPath.h" diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index 61c68a09a5..67c0dd334f 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -22,7 +22,7 @@ #include "src/core/SkTSort.h" #include "src/core/SkTaskGroup.h" #include "src/core/SkTextBlobPriv.h" -#include "src/gpu/GrContextPriv.h" +#include "src/gpu/GrDirectContextPriv.h" #include "src/gpu/GrGpu.h" #include "src/gpu/GrPersistentCacheUtils.h" #include "src/gpu/GrShaderUtils.h"