diff options
author | Brian Osman <brianosman@google.com> | 2017-03-01 20:56:30 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-01 20:56:49 +0000 |
commit | 13d7f5d7c2872ed4298330758e173ae605578cb2 (patch) | |
tree | 2dd0ec0366e70809602b40c59d1b651369da4fbe | |
parent | 5fb88b3ab290fa18ef047705307ebee710c5e85d (diff) |
Revert "Move GrTextureProvider to src"
This reverts commit 24429c68c56683252e3fc2a79d9b660eaf96ec0c.
Reason for revert: Breaking a roll
Original change's description:
> 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 <brianosman@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
>
TBR=bsalomon@google.com,brianosman@google.com,benjaminwagner@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: I43cc135731245c29e24bbecf06ee46c562955c03
Reviewed-on: https://skia-review.googlesource.com/9123
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
-rw-r--r-- | gn/gpu.gni | 2 | ||||
-rw-r--r-- | include/gpu/GrContext.h | 2 | ||||
-rw-r--r-- | include/gpu/GrTextureProvider.h (renamed from src/gpu/GrTextureProvider.h) | 0 | ||||
-rw-r--r-- | src/core/SkImageCacherator.cpp | 1 | ||||
-rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 1 | ||||
-rw-r--r-- | src/gpu/GrBitmapTextureMaker.cpp | 1 | ||||
-rw-r--r-- | src/gpu/GrTextureAdjuster.cpp | 1 | ||||
-rw-r--r-- | src/gpu/GrTextureMaker.cpp | 1 | ||||
-rw-r--r-- | src/gpu/SkGr.cpp | 1 | ||||
-rw-r--r-- | src/gpu/effects/GrTextureStripAtlas.cpp | 1 | ||||
-rw-r--r-- | src/image/SkImage_Gpu.cpp | 1 | ||||
-rw-r--r-- | tests/FloatingPointTextureTest.cpp | 1 | ||||
-rw-r--r-- | tests/GrSurfaceTest.cpp | 1 | ||||
-rw-r--r-- | tests/ImageFilterCacheTest.cpp | 1 | ||||
-rw-r--r-- | tests/ImageStorageTest.cpp | 1 | ||||
-rw-r--r-- | tests/IntTextureTest.cpp | 1 | ||||
-rw-r--r-- | tests/PackedConfigsTextureTest.cpp | 1 | ||||
-rw-r--r-- | tests/ProxyConversionTest.cpp | 1 | ||||
-rw-r--r-- | tests/ProxyRefTest.cpp | 1 | ||||
-rw-r--r-- | tests/ProxyTest.cpp | 1 | ||||
-rw-r--r-- | tests/ReadPixelsTest.cpp | 1 | ||||
-rw-r--r-- | tests/ReadWriteAlphaTest.cpp | 1 | ||||
-rw-r--r-- | tests/SRGBMipMapTest.cpp | 1 | ||||
-rw-r--r-- | tests/SRGBReadWritePixelsTest.cpp | 1 |
24 files changed, 2 insertions, 23 deletions
diff --git a/gn/gpu.gni b/gn/gpu.gni index a773b6c526..d60570d5d2 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -36,6 +36,7 @@ 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", @@ -211,7 +212,6 @@ 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 285525f2f7..2c24050084 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -13,6 +13,7 @@ #include "GrColor.h" #include "GrPaint.h" #include "GrRenderTarget.h" +#include "GrTextureProvider.h" #include "SkMatrix.h" #include "SkPathEffect.h" #include "SkTypes.h" @@ -37,7 +38,6 @@ class GrResourceCache; class GrResourceProvider; class GrTextBlobCache; class GrTextContext; -class GrTextureProvider; class GrSamplerParams; class GrVertexBuffer; class GrSwizzle; diff --git a/src/gpu/GrTextureProvider.h b/include/gpu/GrTextureProvider.h index b8d185648d..b8d185648d 100644 --- a/src/gpu/GrTextureProvider.h +++ b/include/gpu/GrTextureProvider.h diff --git a/src/core/SkImageCacherator.cpp b/src/core/SkImageCacherator.cpp index 5ff7c0bae1..e971883f7c 100644 --- a/src/core/SkImageCacherator.cpp +++ b/src/core/SkImageCacherator.cpp @@ -22,7 +22,6 @@ #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 2ee942d316..dcc34295a4 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -23,7 +23,6 @@ #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 5080c5dbcc..184640f3b1 100644 --- a/src/gpu/GrBitmapTextureMaker.cpp +++ b/src/gpu/GrBitmapTextureMaker.cpp @@ -9,7 +9,6 @@ #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 fca57b7f85..2fa5241060 100644 --- a/src/gpu/GrTextureAdjuster.cpp +++ b/src/gpu/GrTextureAdjuster.cpp @@ -11,7 +11,6 @@ #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 ac89af7d87..e68703afa1 100644 --- a/src/gpu/GrTextureMaker.cpp +++ b/src/gpu/GrTextureMaker.cpp @@ -9,7 +9,6 @@ #include "GrContext.h" #include "GrGpu.h" -#include "GrTextureProvider.h" GrTexture* GrTextureMaker::refTextureForParams(const GrSamplerParams& params, SkColorSpace* dstColorSpace, diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 5b8e061b3a..fe7e98c8d9 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -14,7 +14,6 @@ #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 1791b20e70..f49830481b 100644 --- a/src/gpu/effects/GrTextureStripAtlas.cpp +++ b/src/gpu/effects/GrTextureStripAtlas.cpp @@ -10,7 +10,6 @@ #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 88d18893d7..33d17bc644 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -19,7 +19,6 @@ #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 b19a071eef..84f2a592d8 100644 --- a/tests/FloatingPointTextureTest.cpp +++ b/tests/FloatingPointTextureTest.cpp @@ -18,7 +18,6 @@ #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 5e52a0ad68..5a69e53474 100644 --- a/tests/GrSurfaceTest.cpp +++ b/tests/GrSurfaceTest.cpp @@ -13,7 +13,6 @@ #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 a3372081f0..d2d543c1f9 100644 --- a/tests/ImageFilterCacheTest.cpp +++ b/tests/ImageFilterCacheTest.cpp @@ -179,7 +179,6 @@ 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 d08ac6df63..dc7db517fa 100644 --- a/tests/ImageStorageTest.cpp +++ b/tests/ImageStorageTest.cpp @@ -12,7 +12,6 @@ #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 4642e312e9..c1da323ede 100644 --- a/tests/IntTextureTest.cpp +++ b/tests/IntTextureTest.cpp @@ -11,7 +11,6 @@ #include "GrContext.h" #include "GrRenderTargetContext.h" #include "GrTexture.h" -#include "GrTextureProvider.h" #include "effects/GrSimpleTextureEffect.h" template <typename I> diff --git a/tests/PackedConfigsTextureTest.cpp b/tests/PackedConfigsTextureTest.cpp index c948bf9004..429f8afd14 100644 --- a/tests/PackedConfigsTextureTest.cpp +++ b/tests/PackedConfigsTextureTest.cpp @@ -16,7 +16,6 @@ #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 4504a65b4f..16cea8a674 100644 --- a/tests/ProxyConversionTest.cpp +++ b/tests/ProxyConversionTest.cpp @@ -11,7 +11,6 @@ #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 83411d32c6..3a72acb9f1 100644 --- a/tests/ProxyRefTest.cpp +++ b/tests/ProxyRefTest.cpp @@ -11,7 +11,6 @@ #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 ac3275209f..ef22dfa876 100644 --- a/tests/ProxyTest.cpp +++ b/tests/ProxyTest.cpp @@ -11,7 +11,6 @@ #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 214215419e..aa98e919df 100644 --- a/tests/ReadPixelsTest.cpp +++ b/tests/ReadPixelsTest.cpp @@ -16,7 +16,6 @@ #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 613f45fd7d..27c2260ed4 100644 --- a/tests/ReadWriteAlphaTest.cpp +++ b/tests/ReadWriteAlphaTest.cpp @@ -14,7 +14,6 @@ #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 dd87f19e8e..a25c868dca 100644 --- a/tests/SRGBMipMapTest.cpp +++ b/tests/SRGBMipMapTest.cpp @@ -10,7 +10,6 @@ #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 847dafc5b8..429516710a 100644 --- a/tests/SRGBReadWritePixelsTest.cpp +++ b/tests/SRGBReadWritePixelsTest.cpp @@ -9,7 +9,6 @@ #if SK_SUPPORT_GPU #include "GrCaps.h" #include "GrContext.h" -#include "GrTextureProvider.h" #include "SkCanvas.h" #include "SkSurface.h" |