diff options
author | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-30 17:04:16 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-30 17:04:16 +0000 |
commit | 4e5559af8947ae7dc3df531b6d7a73323db20c3f (patch) | |
tree | 484802043dabe202ed462b7b159beb3f1587b674 /include/gpu/GrConfig.h | |
parent | 35fe7372b1b897a77578a220c334e1fb36d144e9 (diff) |
Allow specifying the max texture count on the bots
https://codereview.chromium.org/50413011/
git-svn-id: http://skia.googlecode.com/svn/trunk@12020 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu/GrConfig.h')
-rw-r--r-- | include/gpu/GrConfig.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h index 29c483f150..fc464c5038 100644 --- a/include/gpu/GrConfig.h +++ b/include/gpu/GrConfig.h @@ -72,7 +72,7 @@ typedef unsigned __int64 uint64_t; * GR_USER_CONFIG_FILE. It should be defined relative to GrConfig.h * * e.g. it can change the BUILD target or supply its own defines for anything - * else (e.g. GR_DEFAULT_TEXTURE_CACHE_MB_LIMIT) + * else (e.g. GR_DEFAULT_RESOURCE_CACHE_MB_LIMIT) */ #if !defined(GR_USER_CONFIG_FILE) #include "GrUserConfig.h" @@ -216,12 +216,21 @@ inline void GrDebugCrash(const char* msg) { GrPrintf(msg); SkASSERT(false); } #endif /** - * GR_DEFAULT_TEXTURE_CACHE_MB_LIMIT gives a threshold (in megabytes) for the + * GR_DEFAULT_RESOURCE_CACHE_MB_LIMIT gives a threshold (in megabytes) for the * maximum size of the texture cache in vram. The value is only a default and * can be overridden at runtime. */ -#if !defined(GR_DEFAULT_TEXTURE_CACHE_MB_LIMIT) - #define GR_DEFAULT_TEXTURE_CACHE_MB_LIMIT 96 +#if !defined(GR_DEFAULT_RESOURCE_CACHE_MB_LIMIT) + #define GR_DEFAULT_RESOURCE_CACHE_MB_LIMIT 96 +#endif + +/** + * GR_DEFAULT_RESOURCE_CACHE_COUNT_LIMIT specifies the maximum number of + * textures the texture cache can hold in vram. The value is only a default and + * can be overridden at runtime. + */ +#if !defined(GR_DEFAULT_RESOURCE_CACHE_COUNT_LIMIT) + #define GR_DEFAULT_RESOURCE_CACHE_COUNT_LIMIT 2048 #endif /** |