Revert of Use scratch keys for stencil buffers.

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.
  */
 
 #include "Benchmark.h"
 
 #if SK_SUPPORT_GPU
 
 #include "GrGpuResource.h"
 #include "GrContext.h"
 #include "GrGpu.h"
 #include "GrResourceCache2.h"
+#include "GrStencilBuffer.h"
+#include "GrTexture.h"
+#include "GrTexturePriv.h"
 #include "SkCanvas.h"
 
 enum {
     CACHE_SIZE_COUNT = 2048,
     CACHE_SIZE_BYTES = 2 * 1024 * 1024,
 };
 
-class FooResource : public GrGpuResource {
+class StencilResource : public GrGpuResource {
 public:
-    SK_DECLARE_INST_COUNT(FooResource);
-    FooResource(GrGpu* gpu, int id)
+    SK_DECLARE_INST_COUNT(StencilResource);
+    StencilResource(GrGpu* gpu, int id)
         : INHERITED(gpu, false)
         , fID(id) {
         this->registerWithCache();
     }
 
     static GrResourceKey ComputeKey(int width, int height, int sampleCnt) {
-        GrCacheID::Key key;
-        memset(&key, 0, sizeof(key));
-        key.fData32[0] = width;
-        key.fData32[1] = height;
-        key.fData32[2] = sampleCnt;
-        static int gType = GrResourceKey::GenerateResourceType();
-        static int gDomain = GrCacheID::GenerateDomain();
-        return GrResourceKey(GrCacheID(gDomain, key), gType, 0);
+        return GrStencilBuffer::ComputeKey(width, height, sampleCnt);
     }
 
     int fID;
 
 private:
     virtual size_t onGpuMemorySize() const SK_OVERRIDE {
         return 100 + ((fID % 1 == 0) ? -5 : 6);
     }
 
     typedef GrGpuResource INHERITED;
 };
 
-class BarResource : public GrGpuResource {
+class TextureResource : public GrGpuResource {
 public:
-    SK_DECLARE_INST_COUNT(BarResource);
-    BarResource(GrGpu* gpu, int id)
+    SK_DECLARE_INST_COUNT(TextureResource);
+    TextureResource(GrGpu* gpu, int id)
         : INHERITED(gpu, false)
         , fID(id) {
         this->registerWithCache();
     }
 
     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:
     virtual size_t onGpuMemorySize() const SK_OVERRIDE {
         return 100 + ((fID % 1 == 0) ? -40 : 33);
     }
 
     typedef GrGpuResource INHERITED;
 };
 
-static void get_foo_params(int i, int* w, int* h, int* s) {
+static void get_stencil(int i, int* w, int* h, int* s) {
     *w = i % 1024;
     *h = i * 2 % 1024;
-    *s = i % 2 == 0 ? 0 : 4;
+    *s = i % 1 == 0 ? 0 : 4;
 }
 
-static void get_bar_surf_desc(int i, GrSurfaceDesc* desc) {
+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 % 2) == 0) ? 0 : 4;
 }
 
 static void populate_cache(GrGpu* gpu, int resourceCount) {
     for (int i = 0; i < resourceCount; ++i) {
         int w, h, s;
-        get_foo_params(i, &w, &h, &s);
-        GrResourceKey key = FooResource::ComputeKey(w, h, s);
-        GrGpuResource* resource = SkNEW_ARGS(FooResource, (gpu, i));
+        get_stencil(i, &w, &h, &s);
+        GrResourceKey key = GrStencilBuffer::ComputeKey(w, h, s);
+        GrGpuResource* resource = SkNEW_ARGS(StencilResource, (gpu, i));
         resource->cacheAccess().setContentKey(key);
         resource->unref();
     }
 
     for (int i = 0; i < resourceCount; ++i) {
         GrSurfaceDesc desc;
-        get_bar_surf_desc(i, &desc);
-        GrResourceKey key =  BarResource::ComputeKey(desc);
-        GrGpuResource* resource = SkNEW_ARGS(BarResource, (gpu, i));
+        get_texture_desc(i, &desc);
+        GrResourceKey key =  TextureResource::ComputeKey(desc);
+        GrGpuResource* resource = SkNEW_ARGS(TextureResource, (gpu, i));
         resource->cacheAccess().setContentKey(key);
         resource->unref();
     }
 }
 
 static void check_cache_contents_or_die(GrResourceCache2* cache, int k) {
     // Benchmark find calls that succeed.
     {
         GrSurfaceDesc desc;
-        get_bar_surf_desc(k, &desc);
-        GrResourceKey key = BarResource::ComputeKey(desc);
+        get_texture_desc(k, &desc);
+        GrResourceKey key = TextureResource::ComputeKey(desc);
         SkAutoTUnref<GrGpuResource> item(cache->findAndRefContentResource(key));
         if (!item) {
             SkFAIL("cache add does not work as expected");
             return;
         }
-        if (static_cast<BarResource*>(item.get())->fID != k) {
+        if (static_cast<TextureResource*>(item.get())->fID != k) {
             SkFAIL("cache add does not work as expected");
             return;
         }
     }
     {
         int w, h, s;
-        get_foo_params(k, &w, &h, &s);
-        GrResourceKey key = FooResource::ComputeKey(w, h, s);
+        get_stencil(k, &w, &h, &s);
+        GrResourceKey key = StencilResource::ComputeKey(w, h, s);
         SkAutoTUnref<GrGpuResource> item(cache->findAndRefContentResource(key));
         if (!item) {
             SkFAIL("cache add does not work as expected");
             return;
         }
-        if (static_cast<FooResource*>(item.get())->fID != k) {
+        if (static_cast<TextureResource*>(item.get())->fID != k) {
             SkFAIL("cache add does not work as expected");
             return;
         }
     }
 
     // Benchmark also find calls that always fail.
     {
         GrSurfaceDesc desc;
-        get_bar_surf_desc(k, &desc);
+        get_texture_desc(k, &desc);
         desc.fHeight |= 1;
-        GrResourceKey key = BarResource::ComputeKey(desc);
+        GrResourceKey key = TextureResource::ComputeKey(desc);
         SkAutoTUnref<GrGpuResource> item(cache->findAndRefContentResource(key));
         if (item) {
             SkFAIL("cache add does not work as expected");
             return;
         }
     }
     {
         int w, h, s;
-        get_foo_params(k, &w, &h, &s);
+        get_stencil(k, &w, &h, &s);
         h |= 1;
-        GrResourceKey key = FooResource::ComputeKey(w, h, s);
+        GrResourceKey key = StencilResource::ComputeKey(w, h, s);
         SkAutoTUnref<GrGpuResource> item(cache->findAndRefContentResource(key));
         if (item) {
             SkFAIL("cache add does not work as expected");
             return;
         }
     }
 }
 
 class GrResourceCacheBenchAdd : public Benchmark {
     enum {
@@ skipping 84 matching lines @@
     }
 
 private:
     typedef Benchmark INHERITED;
 };
 
 DEF_BENCH( return new GrResourceCacheBenchAdd(); )
 DEF_BENCH( return new GrResourceCacheBenchFind(); )
 
 #endif