diff options
| author |  Brian Salomon <bsalomon@google.com> | 2015-10-19 15:12:32 -0400 |
|---|---|---|
| committer | Brian Salomon <bsalomon@google.com> | 2015-10-19 15:12:32 -0400 |
| commit | bc0bcc08b390e430f66710ddfbc47da39ab841d9 (patch) | |
| tree | d70fcd166ca42586469882387733bb54b2d6f34a /include | |
| parent | 386f2d32044a4de3fc5c547da03d8f1464dd210a (diff) | |
Revert recent CLs around GrTextureMaker/GrTextureParamsAdjuster
Review URL: https://codereview.chromium.org/1411353002 .
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrResourceKey.h | 4 | ||||
| -rw-r--r-- | include/gpu/SkGr.h | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/gpu/GrResourceKey.h b/include/gpu/GrResourceKey.h index 9958cfc872..6cfa90fd8a 100644 --- a/include/gpu/GrResourceKey.h +++ b/include/gpu/GrResourceKey.h @@ -138,8 +138,8 @@ private: friend class TestResource; // For unit test to access kMetaDataCnt. - // bmp textures require 5 uint32_t values. - SkAutoSTMalloc<kMetaDataCnt + 5, uint32_t> fKey; + // bmp textures require 4 uint32_t values. + SkAutoSTMalloc<kMetaDataCnt + 4, uint32_t> fKey; }; /** diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h index 17625c4e4e..591d3d88a4 100644 --- a/include/gpu/SkGr.h +++ b/include/gpu/SkGr.h @@ -65,11 +65,9 @@ static inline GrColor SkPMColorToGrColor(SkPMColor c) { } //////////////////////////////////////////////////////////////////////////////// -/** Returns a texture representing the bitmap that is compatible with the GrTextureParams. The - texture is inserted into the cache (unless the bitmap is marked volatile) and can be - retrieved again via this function. */ -GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTextureParams&); +GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTextureParams&); + // TODO: Move SkImageInfo2GrPixelConfig to SkGrPriv.h (requires cleanup to SkWindow its subclasses). GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType, SkColorProfileType); |