diff options
| author |  bsalomon <bsalomon@google.com> | 2014-07-25 08:35:45 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-25 08:35:45 -0700 |
| commit | 6d3fe022d68fd6dd32c0fab30e24fa5a4f048946 (patch) | |
| tree | 7af60205eeb7a7644e1bf4a8edfa0b1545619b0a /bench | |
| parent | 570c392a0056115e103b42c373a61e4e152ea92c (diff) | |
Rename GrGpuObject to GrGpuResource
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/418143004
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/GrResourceCacheBench.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp index b8eacd639e..84e0e5d4c8 100644 --- a/bench/GrResourceCacheBench.cpp +++ b/bench/GrResourceCacheBench.cpp @@ -9,7 +9,7 @@ #if SK_SUPPORT_GPU #include "Benchmark.h" -#include "GrGpuObject.h" +#include "GrGpuResource.h" #include "GrContext.h" #include "GrResourceCache.h" #include "GrStencilBuffer.h" @@ -21,7 +21,7 @@ enum { CACHE_SIZE_BYTES = 2 * 1024 * 1024, }; -class StencilResource : public GrGpuObject { +class StencilResource : public GrGpuResource { public: SK_DECLARE_INST_COUNT(StencilResource); StencilResource(GrGpu* gpu, int id) @@ -42,10 +42,10 @@ public: int fID; private: - typedef GrGpuObject INHERITED; + typedef GrGpuResource INHERITED; }; -class TextureResource : public GrGpuObject { +class TextureResource : public GrGpuResource { public: SK_DECLARE_INST_COUNT(TextureResource); TextureResource(GrGpu* gpu, int id) @@ -66,7 +66,7 @@ public: int fID; private: - typedef GrGpuObject INHERITED; + typedef GrGpuResource INHERITED; }; static void get_stencil(int i, int* w, int* h, int* s) { @@ -89,7 +89,7 @@ static void populate_cache(GrResourceCache* cache, GrGpu* gpu, int resourceCount int w, h, s; get_stencil(i, &w, &h, &s); GrResourceKey key = GrStencilBuffer::ComputeKey(w, h, s); - GrGpuObject* resource = SkNEW_ARGS(StencilResource, (gpu, i)); + GrGpuResource* resource = SkNEW_ARGS(StencilResource, (gpu, i)); cache->purgeAsNeeded(1, resource->gpuMemorySize()); cache->addResource(key, resource); resource->unref(); @@ -99,7 +99,7 @@ static void populate_cache(GrResourceCache* cache, GrGpu* gpu, int resourceCount GrTextureDesc desc; get_texture_desc(i, &desc); GrResourceKey key = TextureResource::ComputeKey(desc); - GrGpuObject* resource = SkNEW_ARGS(TextureResource, (gpu, i)); + GrGpuResource* resource = SkNEW_ARGS(TextureResource, (gpu, i)); cache->purgeAsNeeded(1, resource->gpuMemorySize()); cache->addResource(key, resource); resource->unref(); @@ -112,7 +112,7 @@ static void check_cache_contents_or_die(GrResourceCache* cache, int k) { GrTextureDesc desc; get_texture_desc(k, &desc); GrResourceKey key = TextureResource::ComputeKey(desc); - GrGpuObject* item = cache->find(key); + GrGpuResource* item = cache->find(key); if (NULL == item) { SkFAIL("cache add does not work as expected"); return; @@ -126,7 +126,7 @@ static void check_cache_contents_or_die(GrResourceCache* cache, int k) { int w, h, s; get_stencil(k, &w, &h, &s); GrResourceKey key = StencilResource::ComputeKey(w, h, s); - GrGpuObject* item = cache->find(key); + GrGpuResource* item = cache->find(key); if (NULL == item) { SkFAIL("cache add does not work as expected"); return; @@ -143,7 +143,7 @@ static void check_cache_contents_or_die(GrResourceCache* cache, int k) { get_texture_desc(k, &desc); desc.fHeight |= 1; GrResourceKey key = TextureResource::ComputeKey(desc); - GrGpuObject* item = cache->find(key); + GrGpuResource* item = cache->find(key); if (NULL != item) { SkFAIL("cache add does not work as expected"); return; @@ -154,7 +154,7 @@ static void check_cache_contents_or_die(GrResourceCache* cache, int k) { get_stencil(k, &w, &h, &s); h |= 1; GrResourceKey key = StencilResource::ComputeKey(w, h, s); - GrGpuObject* item = cache->find(key); + GrGpuResource* item = cache->find(key); if (NULL != item) { SkFAIL("cache add does not work as expected"); return; |