Revert of Move npot resizing out of GrContext and simplify GrContext texture functions.

include/gpu/GrTypes.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTypes_DEFINED
 #define GrTypes_DEFINED
@@ skipping 284 matching lines @@
         case kETC1_GrPixelConfig:
         case kLATC_GrPixelConfig:
         case kR11_EAC_GrPixelConfig:
         case kASTC_12x12_GrPixelConfig:
             return true;
         default:
             return false;
     }
 }
 
-/** If the pixel config is compressed, return an equivalent uncompressed format. */
-static inline GrPixelConfig GrMakePixelConfigUncompressed(GrPixelConfig config) {
-    switch (config) {
-        case kIndex_8_GrPixelConfig:
-        case kETC1_GrPixelConfig:
-        case kASTC_12x12_GrPixelConfig:
-            return kRGBA_8888_GrPixelConfig;
-        case kLATC_GrPixelConfig:
-        case kR11_EAC_GrPixelConfig:
-            return kAlpha_8_GrPixelConfig;
-        default:
-            SkASSERT(!GrPixelConfigIsCompressed(config));
-            return config;
-    }
-}
-
 // Returns true if the pixel config is 32 bits per pixel
 static inline bool GrPixelConfigIs8888(GrPixelConfig config) {
     switch (config) {
         case kRGBA_8888_GrPixelConfig:
         case kBGRA_8888_GrPixelConfig:
         case kSRGBA_8888_GrPixelConfig:
             return true;
         default:
             return false;
     }
@@ skipping 324 matching lines @@
 public:
     GrAutoMalloc() : INHERITED() {}
     explicit GrAutoMalloc(size_t size) : INHERITED(size) {}
     virtual ~GrAutoMalloc() {}
 private:
     typedef GrAutoMallocBaseType INHERITED;
 };
 
 #undef GrAutoMallocBaseType
 #endif