diff options
| author |  Brian Osman <brianosman@google.com> | 2017-03-01 21:54:04 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-01 21:54:16 +0000 |
| commit | 2fe8373bb1d56f531f8a2e03a3087b0aa73e199c (patch) | |
| tree | 056ce7010625ac346af41a386e40251ccaff4468 /tests | |
| parent | c1a70e2ddef9147964611e76d2e1142a7ea0ad79 (diff) | |
Revert "Revert "Move GrTextureProvider to src""
This reverts commit 13d7f5d7c2872ed4298330758e173ae605578cb2.
Reason for revert: Fixed client code. Re-landing.
Original change's description:
> 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>
>
TBR=bsalomon@google.com,benjaminwagner@google.com,reviews@skia.org,brianosman@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: Ibcb2ea34654315327c46ea8e4de5bf14376d9bdf
Reviewed-on: https://skia-review.googlesource.com/9127
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tests')
| -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 |
13 files changed, 13 insertions, 0 deletions
diff --git a/tests/FloatingPointTextureTest.cpp b/tests/FloatingPointTextureTest.cpp index 84f2a592d8..b19a071eef 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 5a69e53474..5e52a0ad68 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 d2d543c1f9..a3372081f0 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 dc7db517fa..d08ac6df63 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 c1da323ede..4642e312e9 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 <typename I> diff --git a/tests/PackedConfigsTextureTest.cpp b/tests/PackedConfigsTextureTest.cpp index 429f8afd14..c948bf9004 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 16cea8a674..4504a65b4f 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 3a72acb9f1..83411d32c6 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 ef22dfa876..ac3275209f 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 aa98e919df..214215419e 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 27c2260ed4..613f45fd7d 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 a25c868dca..dd87f19e8e 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 429516710a..847dafc5b8 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" |