AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Revert "Revert "Revert "Move GrTextureProvider to src""""

Browse Source 
This reverts commit 580ffa0fb1.

Reason for revert: Okay, it landed.

Original change's description:
> Revert "Revert "Revert "Move GrTextureProvider to src"""
> 
> This reverts commit 2fe8373bb1.
> 
> Reason for revert: Google3 fix isn't landing.
> 
> Original change's description:
> > Revert "Revert "Move GrTextureProvider to src""
> > 
> > This reverts commit 13d7f5d7c2.
> > 
> > Reason for revert: Fixed client code. Re-landing.
> > 
> > Original change's description:
> > > Revert "Move GrTextureProvider to src"
> > > 
> > > This reverts commit 24429c68c5.
> > > 
> > > 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>
> > 
> 
> TBR=bsalomon@google.com,benjaminwagner@google.com,reviews@skia.org,brianosman@google.com
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
> 
> Change-Id: If5c06c7608d76c45438d03fefb21c4edd7da4f36
> Reviewed-on: https://skia-review.googlesource.com/9128
> 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: I48da978fb73f914c09176e2fefa2882bc8a464a7
Reviewed-on: https://skia-review.googlesource.com/9150
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2017-03-02 13:36:27 -05:00 committed by Skia Commit-Bot
parent cf40e307cd
commit 655f347e28
24 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gn/gpu.gni
View File

@ -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",
@ -213,6 +212,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",

2
include/gpu/GrContext.h
View File

@ -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;

1
src/core/SkImageCacherator.cpp
View File

@ -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"

1
src/effects/SkBlurMaskFilter.cpp
View File

@ -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"

1
src/gpu/GrBitmapTextureMaker.cpp
View File

@ -9,6 +9,7 @@
#include "GrContext.h"
#include "GrGpuResourcePriv.h"
#include "GrTextureProvider.h"
#include "SkBitmap.h"
#include "SkGrPriv.h"
#include "SkPixelRef.h"

1
src/gpu/GrTextureAdjuster.cpp
View File

@ -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,

1
src/gpu/GrTextureMaker.cpp
View File

@ -9,6 +9,7 @@
#include "GrContext.h"
#include "GrGpu.h"
#include "GrTextureProvider.h"
GrTexture* GrTextureMaker::refTextureForParams(const GrSamplerParams& params,
SkColorSpace* dstColorSpace,

0
include/gpu/GrTextureProvider.h → src/gpu/GrTextureProvider.h
View File

1
src/gpu/SkGr.cpp
View File

@ -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"

1
src/gpu/effects/GrTextureStripAtlas.cpp
View File

@ -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"

1
src/image/SkImage_Gpu.cpp
View File

@ -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"

1
tests/FloatingPointTextureTest.cpp
View File

@ -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;

1
tests/GrSurfaceTest.cpp
View File

@ -13,6 +13,7 @@
#include "GrGpu.h"
#include "GrRenderTarget.h"
#include "GrTexture.h"
#include "GrTextureProvider.h"
#include "GrSurfacePriv.h"
#include "Test.h"

1
tests/ImageFilterCacheTest.cpp
View File

@ -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();

1
tests/ImageStorageTest.cpp
View File

@ -12,6 +12,7 @@
#include "GrFragmentProcessor.h"
#include "GrRenderTargetContext.h"
#include "GrTexture.h"
#include "GrTextureProvider.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"

1
tests/IntTextureTest.cpp
View File

@ -11,6 +11,7 @@
#include "GrContext.h"
#include "GrRenderTargetContext.h"
#include "GrTexture.h"
#include "GrTextureProvider.h"
#include "effects/GrSimpleTextureEffect.h"
template <typename I>

1
tests/PackedConfigsTextureTest.cpp
View File

@ -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);

1
tests/ProxyConversionTest.cpp
View File

@ -11,6 +11,7 @@
#if SK_SUPPORT_GPU
#include "GrSurfaceProxy.h"
#include "GrTextureProvider.h"
#include "GrTextureProxy.h"
#include "GrRenderTargetProxy.h"

1
tests/ProxyRefTest.cpp
View File

@ -11,6 +11,7 @@
#if SK_SUPPORT_GPU
#include "GrSurfaceProxy.h"
#include "GrTextureProvider.h"
#include "GrTextureProxy.h"
#include "GrRenderTargetPriv.h"
#include "GrRenderTargetProxy.h"

1
tests/ProxyTest.cpp
View File

@ -11,6 +11,7 @@
#if SK_SUPPORT_GPU
#include "GrSurfaceProxy.h"
#include "GrTextureProvider.h"
#include "GrTextureProxy.h"
#include "GrRenderTargetPriv.h"
#include "GrRenderTargetProxy.h"

1
tests/ReadPixelsTest.cpp
View File

@ -16,6 +16,7 @@
#if SK_SUPPORT_GPU
#include "GrContext.h"
#include "GrTextureProvider.h"
#include "SkGr.h"
#endif

1
tests/ReadWriteAlphaTest.cpp
View File

@ -14,6 +14,7 @@
#include "GrContextPriv.h"
#include "GrSurfaceContext.h"
#include "GrSurfaceProxy.h"
#include "GrTextureProvider.h"
#include "SkCanvas.h"
#include "SkSurface.h"

1
tests/SRGBMipMapTest.cpp
View File

@ -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"

1
tests/SRGBReadWritePixelsTest.cpp
View File

@ -9,6 +9,7 @@
#if SK_SUPPORT_GPU
#include "GrCaps.h"
#include "GrContext.h"
#include "GrTextureProvider.h"
#include "SkCanvas.h"
#include "SkSurface.h"