diff options
| author |  bsalomon <bsalomon@google.com> | 2016-07-13 15:42:40 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-13 15:42:40 -0700 |
| commit | 614d8f9a3c44e22d77fa909e82119e8a6746e1b1 (patch) | |
| tree | 1f74273dc1f959cdf3a596122e5af92d5cb44434 | |
| parent | a2e0837c3395831ff02a2f35469b4fa98963c560 (diff) | |
Remove GrWrapTextureInBitmap from public API
BUG=skia:5531
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2147053002
Review-Url: https://codereview.chromium.org/2147053002
| -rw-r--r-- | gm/drawbitmaprect.cpp | 2 | ||||
| -rw-r--r-- | include/gpu/SkGr.h | 4 | ||||
| -rw-r--r-- | src/core/SkCanvas.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/SkGrPriv.h | 7 | ||||
| -rw-r--r-- | tests/BitmapCopyTest.cpp | 1 | ||||
| -rw-r--r-- | tests/GrTextureMipMapInvalidationTest.cpp | 2 | ||||
| -rw-r--r-- | tests/ReadPixelsTest.cpp | 1 |
7 files changed, 12 insertions, 7 deletions
diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp index 4e1af7ef25..f990097c5d 100644 --- a/gm/drawbitmaprect.cpp +++ b/gm/drawbitmaprect.cpp @@ -17,7 +17,7 @@ #include "SkSurface.h" #if SK_SUPPORT_GPU -#include "SkGr.h" +#include "SkGrPriv.h" #endif static SkBitmap make_chessbm(int w, int h) { diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h index c5ba34403f..881c015b0f 100644 --- a/include/gpu/SkGr.h +++ b/include/gpu/SkGr.h @@ -88,8 +88,4 @@ GrTextureParams::FilterMode GrSkFilterQualityToGrFilterMode(SkFilterQuality pain SkImageInfo GrMakeInfoFromTexture(GrTexture* tex, int w, int h, bool isOpaque); -// Using the dreaded SkGrPixelRef ... -SK_API void GrWrapTextureInBitmap(GrTexture* src, int w, int h, bool isOpaque, - SkBitmap* dst); - #endif diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 0bd3851c06..6119c4ff2f 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -41,7 +41,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrRenderTarget.h" -#include "SkGr.h" +#include "SkGrPriv.h" #endif #define RETURN_ON_NULL(ptr) do { if (nullptr == (ptr)) return; } while (0) diff --git a/src/gpu/SkGrPriv.h b/src/gpu/SkGrPriv.h index ab77dc1e79..b38ce362c1 100644 --- a/src/gpu/SkGrPriv.h +++ b/src/gpu/SkGrPriv.h @@ -100,6 +100,13 @@ bool SkPaintToGrPaintWithTexture(GrContext* context, ////////////////////////////////////////////////////////////////////////////// +// Using the dreaded SkGrPixelRef ... +void GrWrapTextureInBitmap(GrTexture* src, int w, int h, bool isOpaque, + SkBitmap* dst); + + +////////////////////////////////////////////////////////////////////////////// + GrSurfaceDesc GrImageInfoToSurfaceDesc(const SkImageInfo&, const GrCaps&); bool GrPixelConfigToColorAndColorSpace(GrPixelConfig, SkColorType*, sk_sp<SkColorSpace>*); diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp index 717109dd20..848a83e45a 100644 --- a/tests/BitmapCopyTest.cpp +++ b/tests/BitmapCopyTest.cpp @@ -6,6 +6,7 @@ */ #include "SkBitmap.h" +#include "SkGrPriv.h" #include "SkRect.h" #include "SkTemplates.h" #include "Test.h" diff --git a/tests/GrTextureMipMapInvalidationTest.cpp b/tests/GrTextureMipMapInvalidationTest.cpp index e8f6bcce6a..08f23f723c 100644 --- a/tests/GrTextureMipMapInvalidationTest.cpp +++ b/tests/GrTextureMipMapInvalidationTest.cpp @@ -13,7 +13,7 @@ #include "GrTexture.h" #include "GrTexturePriv.h" #include "SkCanvas.h" -#include "SkGr.h" +#include "SkGrPriv.h" #include "SkSurface.h" #include "Test.h" diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp index 20305cc3eb..1123d893dc 100644 --- a/tests/ReadPixelsTest.cpp +++ b/tests/ReadPixelsTest.cpp @@ -15,6 +15,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #include "SkGr.h" +#include "SkGrPriv.h" #endif #include <initializer_list> |