Move ETC1 and LATC enums value to GrPixelConfig

src/gpu/GrTexture.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrTexture.h"
@@ skipping 44 matching lines @@
             // This must not be called until after changing fMipMapsStatus.
             this->didChangeGpuMemorySize();
         }
     }
 }
 
 size_t GrTexture::gpuMemorySize() const {
     size_t textureSize =  (size_t) fDesc.fWidth *
                                    fDesc.fHeight *
                                    GrBytesPerPixel(fDesc.fConfig);
+
+    if (GrPixelConfigIsCompressed(fDesc.fConfig)) {
+        // Figure out the width and height corresponding to the data...
+        SkASSERT((fDesc.fWidth & 3) == 0);
+        SkASSERT((fDesc.fHeight & 3) == 0);
+

[robertphillips, 2014/05/29 12:53:18]

// Both these formats have 4x4 blocks of 8 bytes ?

[krajcevski, 2014/05/29 14:28:22]

Done.

+        if (kETC1_GrPixelConfig == fDesc.fConfig) {
+            textureSize = (fDesc.fWidth >> 2) * (fDesc.fHeight >> 2) * 8;
+        } else if (kLATC_GrPixelConfig == fDesc.fConfig) {
+            textureSize = (fDesc.fWidth >> 2) * (fDesc.fHeight >> 2) * 8;
+        } else {

[robertphillips, 2014/05/29 12:53:18]

Maybe: SkFAIL("Unknown compression format"); return 0; ?

[krajcevski, 2014/05/29 14:28:22]

Done.

+            SkASSERT(false);
+        }
+    }
+
     if (this->impl()->hasMipMaps()) {
         // We don't have to worry about the mipmaps being a different size than
         // we'd expect because we never change fDesc.fWidth/fHeight.
         textureSize *= 2;
     }
     return textureSize;
 }
 
 bool GrTexture::readPixels(int left, int top, int width, int height,
                            GrPixelConfig config, void* buffer,
@@ skipping 141 matching lines @@
     return GrResourceKey(cacheID, texture_resource_type(), 0);
 }
 
 bool GrTextureImpl::NeedsResizing(const GrResourceKey& key) {
     return SkToBool(key.getResourceFlags() & kStretchToPOT_TextureFlag);
 }
 
 bool GrTextureImpl::NeedsBilerp(const GrResourceKey& key) {
     return SkToBool(key.getResourceFlags() & kBilerp_TextureFlag);
 }