From 24429c68c56683252e3fc2a79d9b660eaf96ec0c Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Wed, 1 Mar 2017 13:41:52 -0500 Subject: [PATCH] Move GrTextureProvider to src With this hidden, we can make further simplification. Just want to test this change against our external clients first, to make sure we're okay to proceed. BUG=skia: Change-Id: I47f8c8f2912201c2890bc2f9a9d68aa92649a2d4 Reviewed-on: https://skia-review.googlesource.com/9072 Commit-Queue: Brian Osman Reviewed-by: Brian Salomon --- gn/gpu.gni | 2 +- include/gpu/GrContext.h | 2 +- src/core/SkImageCacherator.cpp | 1 + src/effects/SkBlurMaskFilter.cpp | 1 + src/gpu/GrBitmapTextureMaker.cpp | 1 + src/gpu/GrTextureAdjuster.cpp | 1 + src/gpu/GrTextureMaker.cpp | 1 + {include => src}/gpu/GrTextureProvider.h | 0 src/gpu/SkGr.cpp | 1 + src/gpu/effects/GrTextureStripAtlas.cpp | 1 + src/image/SkImage_Gpu.cpp | 1 + tests/FloatingPointTextureTest.cpp | 1 + tests/GrSurfaceTest.cpp | 1 + tests/ImageFilterCacheTest.cpp | 1 + tests/ImageStorageTest.cpp | 1 + tests/IntTextureTest.cpp | 1 + tests/PackedConfigsTextureTest.cpp | 1 + tests/ProxyConversionTest.cpp | 1 + tests/ProxyRefTest.cpp | 1 + tests/ProxyTest.cpp | 1 + tests/ReadPixelsTest.cpp | 1 + tests/ReadWriteAlphaTest.cpp | 1 + tests/SRGBMipMapTest.cpp | 1 + tests/SRGBReadWritePixelsTest.cpp | 1 + 24 files changed, 23 insertions(+), 2 deletions(-) rename {include => src}/gpu/GrTextureProvider.h (100%) diff --git a/gn/gpu.gni b/gn/gpu.gni index d60570d..a773b6c 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -36,7 +36,6 @@ skia_gpu_sources = [ "$_include/gpu/GrTexture.h", "$_include/gpu/GrTextureContext.h", "$_include/gpu/GrSamplerParams.h", - "$_include/gpu/GrTextureProvider.h", "$_include/gpu/GrTestUtils.h", "$_include/gpu/GrTypes.h", "$_include/gpu/GrTypesPriv.h", @@ -212,6 +211,7 @@ skia_gpu_sources = [ "$_src/gpu/GrTextureProducer.cpp", "$_src/gpu/GrTextureProducer.h", "$_src/gpu/GrTextureProvider.cpp", + "$_src/gpu/GrTextureProvider.h", "$_src/gpu/GrTextureProxy.cpp", "$_src/gpu/GrTextureRenderTargetProxy.cpp", "$_src/gpu/GrTextureToYUVPlanes.cpp", diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index 2c24050..285525f 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -13,7 +13,6 @@ #include "GrColor.h" #include "GrPaint.h" #include "GrRenderTarget.h" -#include "GrTextureProvider.h" #include "SkMatrix.h" #include "SkPathEffect.h" #include "SkTypes.h" @@ -38,6 +37,7 @@ class GrResourceCache; class GrResourceProvider; class GrTextBlobCache; class GrTextContext; +class GrTextureProvider; class GrSamplerParams; class GrVertexBuffer; class GrSwizzle; diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp index e971883..5ff7c0b 100644 --- a/src/core/SkImageCacherator.cpp +++ b/src/core/SkImageCacherator.cpp @@ -22,6 +22,7 @@ #include "GrImageTextureMaker.h" #include "GrResourceKey.h" #include "GrSamplerParams.h" +#include "GrTextureProvider.h" #include "GrYUVProvider.h" #include "SkGr.h" #include "SkGrPriv.h" diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index dcc3429..2ee942d 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -23,6 +23,7 @@ #include "GrFragmentProcessor.h" #include "GrShaderCaps.h" #include "GrStyle.h" +#include "GrTextureProvider.h" #include "GrTextureProxy.h" #include "effects/GrSimpleTextureEffect.h" #include "glsl/GrGLSLFragmentProcessor.h" diff --git a/src/gpu/GrBitmapTextureMaker.cpp b/src/gpu/GrBitmapTextureMaker.cpp index 184640f..5080c5d 100644 --- a/src/gpu/GrBitmapTextureMaker.cpp +++ b/src/gpu/GrBitmapTextureMaker.cpp @@ -9,6 +9,7 @@ #include "GrContext.h" #include "GrGpuResourcePriv.h" +#include "GrTextureProvider.h" #include "SkBitmap.h" #include "SkGrPriv.h" #include "SkPixelRef.h" diff --git a/src/gpu/GrTextureAdjuster.cpp b/src/gpu/GrTextureAdjuster.cpp index 2fa5241..fca57b7 100644 --- a/src/gpu/GrTextureAdjuster.cpp +++ b/src/gpu/GrTextureAdjuster.cpp @@ -11,6 +11,7 @@ #include "GrGpu.h" #include "GrGpuResourcePriv.h" #include "GrTexture.h" +#include "GrTextureProvider.h" #include "SkGrPriv.h" GrTextureAdjuster::GrTextureAdjuster(GrTexture* original, SkAlphaType alphaType, diff --git a/src/gpu/GrTextureMaker.cpp b/src/gpu/GrTextureMaker.cpp index e68703a..ac89af7 100644 --- a/src/gpu/GrTextureMaker.cpp +++ b/src/gpu/GrTextureMaker.cpp @@ -9,6 +9,7 @@ #include "GrContext.h" #include "GrGpu.h" +#include "GrTextureProvider.h" GrTexture* GrTextureMaker::refTextureForParams(const GrSamplerParams& params, SkColorSpace* dstColorSpace, diff --git a/include/gpu/GrTextureProvider.h b/src/gpu/GrTextureProvider.h similarity index 100% rename from include/gpu/GrTextureProvider.h rename to src/gpu/GrTextureProvider.h diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index fe7e98c..5b8e061 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -14,6 +14,7 @@ #include "GrGpuResourcePriv.h" #include "GrRenderTargetContext.h" #include "GrTexturePriv.h" +#include "GrTextureProvider.h" #include "GrTextureProxy.h" #include "GrTypes.h" #include "GrXferProcessor.h" diff --git a/src/gpu/effects/GrTextureStripAtlas.cpp b/src/gpu/effects/GrTextureStripAtlas.cpp index f498304..1791b20 100644 --- a/src/gpu/effects/GrTextureStripAtlas.cpp +++ b/src/gpu/effects/GrTextureStripAtlas.cpp @@ -10,6 +10,7 @@ #include "GrContextPriv.h" #include "GrResourceProvider.h" #include "GrSurfaceContext.h" +#include "GrTextureProvider.h" #include "SkGr.h" #include "SkPixelRef.h" #include "SkTSearch.h" diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index 33d17bc..88d1889 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -19,6 +19,7 @@ #include "GrRenderTargetContext.h" #include "GrTextureAdjuster.h" #include "GrTexturePriv.h" +#include "GrTextureProvider.h" #include "GrTextureProxy.h" #include "effects/GrYUVEffect.h" #include "SkCanvas.h" diff --git a/tests/FloatingPointTextureTest.cpp b/tests/FloatingPointTextureTest.cpp index 84f2a59..b19a071 100644 --- a/tests/FloatingPointTextureTest.cpp +++ b/tests/FloatingPointTextureTest.cpp @@ -18,6 +18,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrTexture.h" +#include "GrTextureProvider.h" #include "SkHalf.h" static const int DEV_W = 100, DEV_H = 100; diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp index 5a69e53..5e52a0a 100644 --- a/tests/GrSurfaceTest.cpp +++ b/tests/GrSurfaceTest.cpp @@ -13,6 +13,7 @@ #include "GrGpu.h" #include "GrRenderTarget.h" #include "GrTexture.h" +#include "GrTextureProvider.h" #include "GrSurfacePriv.h" #include "Test.h" diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp index d2d543c..a337208 100644 --- a/tests/ImageFilterCacheTest.cpp +++ b/tests/ImageFilterCacheTest.cpp @@ -179,6 +179,7 @@ DEF_TEST(ImageFilterCache_ImageBackedRaster, reporter) { #if SK_SUPPORT_GPU #include "GrContext.h" +#include "GrTextureProvider.h" static GrTexture* create_texture(GrContext* context) { SkBitmap srcBM = create_bm(); diff --git a/tests/ImageStorageTest.cpp b/tests/ImageStorageTest.cpp index dc7db51..d08ac6d 100644 --- a/tests/ImageStorageTest.cpp +++ b/tests/ImageStorageTest.cpp @@ -12,6 +12,7 @@ #include "GrFragmentProcessor.h" #include "GrRenderTargetContext.h" #include "GrTexture.h" +#include "GrTextureProvider.h" #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" diff --git a/tests/IntTextureTest.cpp b/tests/IntTextureTest.cpp index c1da323..4642e31 100644 --- a/tests/IntTextureTest.cpp +++ b/tests/IntTextureTest.cpp @@ -11,6 +11,7 @@ #include "GrContext.h" #include "GrRenderTargetContext.h" #include "GrTexture.h" +#include "GrTextureProvider.h" #include "effects/GrSimpleTextureEffect.h" template diff --git a/tests/PackedConfigsTextureTest.cpp b/tests/PackedConfigsTextureTest.cpp index 429f8af..c948bf9 100644 --- a/tests/PackedConfigsTextureTest.cpp +++ b/tests/PackedConfigsTextureTest.cpp @@ -16,6 +16,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrTexture.h" +#include "GrTextureProvider.h" static const int DEV_W = 10, DEV_H = 10; static const SkIRect DEV_RECT = SkIRect::MakeWH(DEV_W, DEV_H); diff --git a/tests/ProxyConversionTest.cpp b/tests/ProxyConversionTest.cpp index 16cea8a..4504a65 100644 --- a/tests/ProxyConversionTest.cpp +++ b/tests/ProxyConversionTest.cpp @@ -11,6 +11,7 @@ #if SK_SUPPORT_GPU #include "GrSurfaceProxy.h" +#include "GrTextureProvider.h" #include "GrTextureProxy.h" #include "GrRenderTargetProxy.h" diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp index 3a72acb..83411d3 100644 --- a/tests/ProxyRefTest.cpp +++ b/tests/ProxyRefTest.cpp @@ -11,6 +11,7 @@ #if SK_SUPPORT_GPU #include "GrSurfaceProxy.h" +#include "GrTextureProvider.h" #include "GrTextureProxy.h" #include "GrRenderTargetPriv.h" #include "GrRenderTargetProxy.h" diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp index ef22dfa..ac32752 100644 --- a/tests/ProxyTest.cpp +++ b/tests/ProxyTest.cpp @@ -11,6 +11,7 @@ #if SK_SUPPORT_GPU #include "GrSurfaceProxy.h" +#include "GrTextureProvider.h" #include "GrTextureProxy.h" #include "GrRenderTargetPriv.h" #include "GrRenderTargetProxy.h" diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp index aa98e91..2142154 100644 --- a/tests/ReadPixelsTest.cpp +++ b/tests/ReadPixelsTest.cpp @@ -16,6 +16,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" +#include "GrTextureProvider.h" #include "SkGr.h" #endif diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp index 27c2260..613f45f 100644 --- a/tests/ReadWriteAlphaTest.cpp +++ b/tests/ReadWriteAlphaTest.cpp @@ -14,6 +14,7 @@ #include "GrContextPriv.h" #include "GrSurfaceContext.h" #include "GrSurfaceProxy.h" +#include "GrTextureProvider.h" #include "SkCanvas.h" #include "SkSurface.h" diff --git a/tests/SRGBMipMapTest.cpp b/tests/SRGBMipMapTest.cpp index a25c868..dd87f19 100644 --- a/tests/SRGBMipMapTest.cpp +++ b/tests/SRGBMipMapTest.cpp @@ -10,6 +10,7 @@ #include "GrCaps.h" #include "GrContext.h" #include "GrRenderTargetContext.h" +#include "GrTextureProvider.h" #include "gl/GrGLGpu.h" #include "SkCanvas.h" #include "SkSurface.h" diff --git a/tests/SRGBReadWritePixelsTest.cpp b/tests/SRGBReadWritePixelsTest.cpp index 4295167..847dafc 100644 --- a/tests/SRGBReadWritePixelsTest.cpp +++ b/tests/SRGBReadWritePixelsTest.cpp @@ -9,6 +9,7 @@ #if SK_SUPPORT_GPU #include "GrCaps.h" #include "GrContext.h" +#include "GrTextureProvider.h" #include "SkCanvas.h" #include "SkSurface.h" -- 2.7.4