diff options
| author |  bsalomon <bsalomon@google.com> | 2014-11-13 13:33:28 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-13 13:33:28 -0800 |
| commit | f21dab95405979a4aff9f6a741c818304a67f220 (patch) | |
| tree | 9dba5c1c7bb95c5197d7708ef3fa057fe91e6c4f /gyp | |
| parent | 66a450f21a3da174b7eed89a1d5fc8591e8b6ee6 (diff) | |
Revert of Replace GrResourceCache with GrResourceCache2. (patchset #6 id:100001 of https://codereview.chromium.org/716143004/)
Reason for revert:
Breaking stuff
Original issue's description:
> Replace GrResourceCache with GrResourceCache2.
>
> BUG=skia:2889
>
> Committed: https://skia.googlesource.com/skia/+/66a450f21a3da174b7eed89a1d5fc8591e8b6ee6
TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2889
Review URL: https://codereview.chromium.org/715333003
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/gpu.gyp | 10 | ||||
| -rw-r--r-- | gyp/gpu.gypi | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index 631945607d..d40afe1a95 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -63,6 +63,16 @@ ], }, }], + [ 'skia_resource_cache_mb_limit != 0', { + 'defines': [ + 'GR_DEFAULT_RESOURCE_CACHE_MB_LIMIT=<(skia_resource_cache_mb_limit)', + ], + }], + [ 'skia_resource_cache_count_limit != 0', { + 'defines': [ + 'GR_DEFAULT_RESOURCE_CACHE_COUNT_LIMIT=<(skia_resource_cache_count_limit)', + ], + }], ], 'direct_dependent_settings': { 'conditions': [ diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi index 5095c44c5c..8eca40c3d3 100644 --- a/gyp/gpu.gypi +++ b/gyp/gpu.gypi @@ -136,6 +136,8 @@ '<(skia_src_path)/gpu/GrRenderTarget.cpp', '<(skia_src_path)/gpu/GrReducedClip.cpp', '<(skia_src_path)/gpu/GrReducedClip.h', + '<(skia_src_path)/gpu/GrResourceCache.cpp', + '<(skia_src_path)/gpu/GrResourceCache.h', '<(skia_src_path)/gpu/GrResourceCache2.cpp', '<(skia_src_path)/gpu/GrResourceCache2.h', '<(skia_src_path)/gpu/GrStencil.cpp', |