diff options
author | 2015-10-09 13:36:42 -0700 | |
---|---|---|
committer | 2015-10-09 13:36:42 -0700 | |
commit | f276ac5c16d39a2b877300d760041f0291bb5ec9 (patch) | |
tree | 18f612b69351d42440f19e51347d14bfd182b91d /include | |
parent | cda8ec2b030c6fcb58d2d11f4983a14c0f355235 (diff) |
Move functions from SkGr to SkGrPriv.h
Review URL: https://codereview.chromium.org/1397123002
Diffstat (limited to 'include')
-rw-r--r-- | include/gpu/SkGr.h | 87 |
1 files changed, 18 insertions, 69 deletions
diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h index bf92fe80f1..8ea3af12c7 100644 --- a/include/gpu/SkGr.h +++ b/include/gpu/SkGr.h @@ -6,54 +6,24 @@ * found in the LICENSE file. */ - - #ifndef SkGr_DEFINED #define SkGr_DEFINED -#include <stddef.h> - -// Gr headers -#include "GrContext.h" +#include "GrColor.h" #include "GrTextureAccess.h" -#include "GrTypes.h" +#include "SkColor.h" +#include "SkColorPriv.h" +#include "SkFilterQuality.h" +#include "SkImageInfo.h" -// skia headers -#include "SkBitmap.h" -#include "SkPath.h" -#include "SkPoint.h" -#include "SkRegion.h" -#include "SkClipStack.h" +class GrContext; +class GrTexture; +class GrTextureParams; +class SkBitmap; //////////////////////////////////////////////////////////////////////////////// // Sk to Gr Type conversions -GR_STATIC_ASSERT((int)kZero_GrBlendCoeff == (int)SkXfermode::kZero_Coeff); -GR_STATIC_ASSERT((int)kOne_GrBlendCoeff == (int)SkXfermode::kOne_Coeff); -GR_STATIC_ASSERT((int)kSC_GrBlendCoeff == (int)SkXfermode::kSC_Coeff); -GR_STATIC_ASSERT((int)kISC_GrBlendCoeff == (int)SkXfermode::kISC_Coeff); -GR_STATIC_ASSERT((int)kDC_GrBlendCoeff == (int)SkXfermode::kDC_Coeff); -GR_STATIC_ASSERT((int)kIDC_GrBlendCoeff == (int)SkXfermode::kIDC_Coeff); -GR_STATIC_ASSERT((int)kSA_GrBlendCoeff == (int)SkXfermode::kSA_Coeff); -GR_STATIC_ASSERT((int)kISA_GrBlendCoeff == (int)SkXfermode::kISA_Coeff); -GR_STATIC_ASSERT((int)kDA_GrBlendCoeff == (int)SkXfermode::kDA_Coeff); -GR_STATIC_ASSERT((int)kIDA_GrBlendCoeff == (int)SkXfermode::kIDA_Coeff); -GR_STATIC_ASSERT(SkXfermode::kCoeffCount == 10); - -#define SkXfermodeCoeffToGrBlendCoeff(X) ((GrBlendCoeff)(X)) - -/////////////////////////////////////////////////////////////////////////////// - -#include "SkColorPriv.h" - -GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType, SkColorProfileType); - -static inline GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info) { - return SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType(), info.profileType()); -} - -bool GrPixelConfig2ColorAndProfileType(GrPixelConfig, SkColorType*, SkColorProfileType*); - static inline GrColor SkColorToPremulGrColor(SkColor c) { SkPMColor pm = SkPreMultiplyColor(c); unsigned r = SkGetPackedR32(pm); @@ -94,39 +64,17 @@ static inline GrColor SkPMColorToGrColor(SkPMColor c) { SkGetPackedA32(c)); } -GrSurfaceDesc GrImageInfoToSurfaceDesc(const SkImageInfo&); - //////////////////////////////////////////////////////////////////////////////// -/** - * If the compressed data in the SkData is supported (as a texture format, this returns - * the pixel-config that should be used, and sets outStartOfDataToUpload to the ptr into - * the data where the actual raw data starts (skipping any header bytes). - * - * If the compressed data is not supported, this returns kUnknown_GrPixelConfig, and - * ignores outStartOfDataToUpload. - */ -GrPixelConfig GrIsCompressedTextureDataSupported(GrContext* ctx, SkData* data, - int expectedW, int expectedH, - const void** outStartOfDataToUpload); - -bool GrIsImageInCache(const GrContext* ctx, uint32_t imageID, const SkIRect& subset, - GrTexture* nativeTexture, const GrTextureParams*); - GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTextureParams*); GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, SkImageUsageType); -GrTexture* GrCreateTextureForPixels(GrContext*, const GrUniqueKey& optionalKey, GrSurfaceDesc, - SkPixelRef* pixelRefForInvalidationNotificationOrNull, - const void* pixels, size_t rowBytesOrZero); - -//////////////////////////////////////////////////////////////////////////////// - -SkImageInfo GrMakeInfoFromTexture(GrTexture* tex, int w, int h, bool isOpaque); +// TODO: Move SkImageInfo2GrPixelConfig to SkGrPriv.h (requires cleanup to SkWindow its subclasses). +GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType, SkColorProfileType); -// Using the dreaded SkGrPixelRef ... -SK_API void GrWrapTextureInBitmap(GrTexture* src, int w, int h, bool isOpaque, - SkBitmap* dst); +static inline GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info) { + return SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType(), info.profileType()); +} GrTextureParams::FilterMode GrSkFilterQualityToGrFilterMode(SkFilterQuality paintFilterQuality, const SkMatrix& viewM, @@ -134,10 +82,11 @@ GrTextureParams::FilterMode GrSkFilterQualityToGrFilterMode(SkFilterQuality pain bool* doBicubic); //////////////////////////////////////////////////////////////////////////////// -// Classes -class SkGlyphCache; +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 |