Use an array of nonpurgeable resources in GrResourceCache

Use an array of nonpurgeable resources in GrResourceCache

Committed: https://skia.googlesource.com/skia/+/f320e04c50a1c8a861bc1d8f50bf732044ff9843

[bsalomon, 2015-02-17 17:24:10]

bsalomon@google.com changed reviewers:
+ robertphillips@google.com

[bsalomon, 2015-02-17 17:24:11]

Followup to https://codereview.chromium.org/921323002/

[robertphillips, 2015-02-17 18:32:23]

lgtm

https://codereview.chromium.org/932863004/diff/40001/src/gpu/GrResourceCache.cpp
File src/gpu/GrResourceCache.cpp (right):

https://codereview.chromium.org/932863004/diff/40001/src/gpu/GrResourceCache....
src/gpu/GrResourceCache.cpp:149: 
space after while ?

https://codereview.chromium.org/932863004/diff/40001/src/gpu/GrResourceCache....
src/gpu/GrResourceCache.cpp:222: return NULL;
Don't we really want to check that the new resource can be added without going
over budget?

https://codereview.chromium.org/932863004/diff/40001/src/gpu/GrResourceCache....
src/gpu/GrResourceCache.cpp:527: }
Shouldn't we assert here?

https://codereview.chromium.org/932863004/diff/40001/src/gpu/GrResourceCache.h
File src/gpu/GrResourceCache.h (right):

https://codereview.chromium.org/932863004/diff/40001/src/gpu/GrResourceCache....
src/gpu/GrResourceCache.h:191: void removeFromNonpurgeableArray(GrGpuResource*);
<= for underBudget ?

[bsalomon, 2015-02-17 19:30:02]

New patchsets have been uploaded after l-g-t-m from robertphillips@google.com

[bsalomon, 2015-02-17 19:32:51]

https://codereview.chromium.org/932863004/diff/40001/src/gpu/GrResourceCache.cpp
File src/gpu/GrResourceCache.cpp (right):

https://codereview.chromium.org/932863004/diff/40001/src/gpu/GrResourceCache....
src/gpu/GrResourceCache.cpp:149: 
On 2015/02/17 18:32:23, robertphillips wrote:
> space after while ?

Done.

https://codereview.chromium.org/932863004/diff/40001/src/gpu/GrResourceCache....
src/gpu/GrResourceCache.cpp:222: return NULL;
On 2015/02/17 18:32:23, robertphillips wrote:
> Don't we really want to check that the new resource can be added without going
> over budget?

I think so, but there is no way to do that currently. I'm going to revert to the
old behavior and leave the TODO.

https://codereview.chromium.org/932863004/diff/40001/src/gpu/GrResourceCache....
src/gpu/GrResourceCache.cpp:527: }
On 2015/02/17 18:32:23, robertphillips wrote:
> Shouldn't we assert here?

Hm, I suppose so.

https://codereview.chromium.org/932863004/diff/40001/src/gpu/GrResourceCache.h
File src/gpu/GrResourceCache.h (right):

https://codereview.chromium.org/932863004/diff/40001/src/gpu/GrResourceCache....
src/gpu/GrResourceCache.h:191: void removeFromNonpurgeableArray(GrGpuResource*);
On 2015/02/17 18:32:23, robertphillips wrote:
> <= for underBudget ?

I made it < since this is used to check if there is room for more (that is were
not at the budget but really under the budget). However, it was unused in the
updated patchset, so it is removed.

https://codereview.chromium.org/932863004/diff/80001/src/gpu/GrResourceCache.cpp
File src/gpu/GrResourceCache.cpp (right):

https://codereview.chromium.org/932863004/diff/80001/src/gpu/GrResourceCache....
src/gpu/GrResourceCache.cpp:288: if (fBudgetedCount < fMaxCount &&
restored this to the previous and more correct logic.

[bsalomon, 2015-02-17 22:01:12]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2015-02-17 22:01:39]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/932863004/80001

[commit-bot: I haz the power, 2015-02-17 22:03:19]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-02-17 22:03:20]

Try jobs failed on following builders:
  Build-Ubuntu13.10-Clang-x86_64-Debug-Trybot on client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu13.10-Cl...)
  Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Android-Trybot on client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu13.10-GC...)

[bsalomon, 2015-02-17 23:02:58]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2015-02-17 23:03:59]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/932863004/100001

[commit-bot: I haz the power, 2015-02-17 23:09:38]

Committed patchset #6 (id:100001) as
https://skia.googlesource.com/skia/+/f320e04c50a1c8a861bc1d8f50bf732044ff9843