rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags

bench/GrResourceCacheBench.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #if SK_SUPPORT_GPU
 
@@ skipping 45 matching lines @@
         , fID(id) {
         this->registerWithCache();
     }
 
     virtual ~TextureResource() { this->release(); }
 
     virtual size_t gpuMemorySize() const SK_OVERRIDE {
         return 100 + ((fID % 1 == 0) ? -40 : 33);
     }
 
-    static GrResourceKey ComputeKey(const GrTextureDesc& desc) {
+    static GrResourceKey ComputeKey(const GrSurfaceDesc& desc) {
         GrCacheID::Key key;
         memset(&key, 0, sizeof(key));
         key.fData32[0] = (desc.fWidth) | (desc.fHeight << 16);
         key.fData32[1] = desc.fConfig | desc.fSampleCnt << 16;
         key.fData32[2] = desc.fFlags;
         static int gType = GrResourceKey::GenerateResourceType();
         static int gDomain = GrCacheID::GenerateDomain();
         return GrResourceKey(GrCacheID(gDomain, key), gType, 0);
     }
 
     int fID;
 
 private:
     typedef GrGpuResource INHERITED;
 };
 
 static void get_stencil(int i, int* w, int* h, int* s) {
     *w = i % 1024;
     *h = i * 2 % 1024;
     *s = i % 1 == 0 ? 0 : 4;
 }
 
-static void get_texture_desc(int i, GrTextureDesc* desc) {
-    desc->fFlags = kRenderTarget_GrTextureFlagBit |
-        kNoStencil_GrTextureFlagBit;
+static void get_texture_desc(int i, GrSurfaceDesc* desc) {
+    desc->fFlags = kRenderTarget_GrSurfaceFlag |
+        kNoStencil_GrSurfaceFlag;
     desc->fWidth  = i % 1024;
     desc->fHeight = i * 2 % 1024;
     desc->fConfig = static_cast<GrPixelConfig>(i % (kLast_GrPixelConfig + 1));
     desc->fSampleCnt = i % 1 == 0 ? 0 : 4;
 }
 
 static void populate_cache(GrResourceCache* cache, GrGpu* gpu, int resourceCount) {
     for (int i = 0; i < resourceCount; ++i) {
         int w, h, s;
         get_stencil(i, &w, &h, &s);
         GrResourceKey key = GrStencilBuffer::ComputeKey(w, h, s);
         GrGpuResource* resource = SkNEW_ARGS(StencilResource, (gpu, i));
         cache->purgeAsNeeded(1, resource->gpuMemorySize());
         cache->addResource(key, resource);
         resource->unref();
     }
 
     for (int i = 0; i < resourceCount; ++i) {
-        GrTextureDesc desc;
+        GrSurfaceDesc desc;
         get_texture_desc(i, &desc);
         GrResourceKey key =  TextureResource::ComputeKey(desc);
         GrGpuResource* resource = SkNEW_ARGS(TextureResource, (gpu, i));
         cache->purgeAsNeeded(1, resource->gpuMemorySize());
         cache->addResource(key, resource);
         resource->unref();
     }
 }
 
 static void check_cache_contents_or_die(GrResourceCache* cache, int k) {
     // Benchmark find calls that succeed.
     {
-        GrTextureDesc desc;
+        GrSurfaceDesc desc;
         get_texture_desc(k, &desc);
         GrResourceKey key = TextureResource::ComputeKey(desc);
         GrGpuResource* item = cache->find(key);
         if (NULL == item) {
             SkFAIL("cache add does not work as expected");
             return;
         }
         if (static_cast<TextureResource*>(item)->fID != k) {
             SkFAIL("cache add does not work as expected");
             return;
         }
     }
     {
         int w, h, s;
         get_stencil(k, &w, &h, &s);
         GrResourceKey key = StencilResource::ComputeKey(w, h, s);
         GrGpuResource* item = cache->find(key);
         if (NULL == item) {
             SkFAIL("cache add does not work as expected");
             return;
         }
         if (static_cast<TextureResource*>(item)->fID != k) {
             SkFAIL("cache add does not work as expected");
             return;
         }
     }
 
     // Benchmark also find calls that always fail.
     {
-        GrTextureDesc desc;
+        GrSurfaceDesc desc;
         get_texture_desc(k, &desc);
         desc.fHeight |= 1;
         GrResourceKey key = TextureResource::ComputeKey(desc);
         GrGpuResource* item = cache->find(key);
         if (item) {
             SkFAIL("cache add does not work as expected");
             return;
         }
     }
     {
@@ skipping 75 matching lines @@
     }
 
 private:
     typedef Benchmark INHERITED;
 };
 
 DEF_BENCH( return new GrResourceCacheBenchAdd(); )
 DEF_BENCH( return new GrResourceCacheBenchFind(); )
 
 #endif