Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Unified Diff: src/gpu/GrTexture.cpp

Issue 399623004: Add new ASTC pixel config (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrDrawTarget.cpp ('k') | src/gpu/gl/GrGLCaps.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrTexture.cpp
diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
index 984a9cf77581d38cbb25a5dec97f9cccab0d64b1..fb5a8d350e1551458f91768ed66a311aa23e8140 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -64,22 +64,7 @@ size_t GrTexture::gpuMemorySize() const {
GrBytesPerPixel(fDesc.fConfig);
if (GrPixelConfigIsCompressed(fDesc.fConfig)) {
- // Figure out the width and height corresponding to the data...
-
- // Both of the available formats (ETC1 and LATC) have 4x4
- // blocks that compress down to 8 bytes.
- switch(fDesc.fConfig) {
- case kETC1_GrPixelConfig:
- case kLATC_GrPixelConfig:
- case kR11_EAC_GrPixelConfig:
- SkASSERT((fDesc.fWidth & 3) == 0);
- SkASSERT((fDesc.fHeight & 3) == 0);
- textureSize = (fDesc.fWidth >> 2) * (fDesc.fHeight >> 2) * 8;
- break;
-
- default:
- SkFAIL("Unknown compressed config");
- }
+ textureSize = GrCompressedFormatDataSize(fDesc.fConfig, fDesc.fWidth, fDesc.fHeight);
}
if (this->impl()->hasMipMaps()) {
« no previous file with comments | « src/gpu/GrDrawTarget.cpp ('k') | src/gpu/gl/GrGLCaps.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698