diff options
Diffstat (limited to 'include/gpu')
| -rw-r--r-- | include/gpu/GrContext.h | 6 | ||||
| -rw-r--r-- | include/gpu/GrTypes.h | 20 |
2 files changed, 3 insertions, 23 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index c54f2e6b23..5b7ef25ced 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -204,11 +204,10 @@ public: * for different wrap modes on GPUs with limited NPOT * texture support). NULL implies clamp wrap modes. * @param desc Description of the texture properties. - * @param cacheID Cache-specific properties (e.g., texture gen ID) + * @param cacheID Cache-specific properties (e.g., texture gen ID) * @param srcData Pointer to the pixel values. * @param rowBytes The number of bytes between rows of the texture. Zero - * implies tightly packed rows. For compressed pixel configs, this - * field is ignored. + * implies tightly packed rows. * @param cacheKey (optional) If non-NULL, we'll write the cache key we used to cacheKey. */ GrTexture* createTexture(const GrTextureParams* params, @@ -217,6 +216,7 @@ public: const void* srcData, size_t rowBytes, GrResourceKey* cacheKey = NULL); + /** * Search for an entry based on key and dimensions. If found, ref it and return it. The return * value will be NULL if not found. The caller must balance with a call to unref. diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h index 34f4e2827d..53e633da57 100644 --- a/include/gpu/GrTypes.h +++ b/include/gpu/GrTypes.h @@ -641,26 +641,6 @@ enum GrGLBackendState { }; /** - * Returns the data size for the given compressed pixel config - */ -static inline size_t GrCompressedFormatDataSize(GrPixelConfig config, - int width, int height) { - SkASSERT(GrPixelConfigIsCompressed(config)); - - switch (config) { - case kLATC_GrPixelConfig: - case kETC1_GrPixelConfig: - SkASSERT((width & 3) == 0); - SkASSERT((height & 3) == 0); - return (width >> 2) * (height >> 2) * 8; - - default: - SkFAIL("Unknown compressed pixel config"); - return 4 * width * height; - } -} - -/** * This value translates to reseting all the context state for any backend. */ static const uint32_t kAll_GrBackendState = 0xffffffff; |