Make textures register with GrResourceCache2 as scratch.

Make textures register with GrResourceCache2 as scratch.

Committed: https://skia.googlesource.com/skia/+/744998e666073166307d2522847b2536000a7619

[bsalomon, 2014-08-27 18:14:34]

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

[bsalomon, 2014-08-27 18:14:34]

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h
File include/gpu/GrResourceKey.h (right):

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h#...
include/gpu/GrResourceKey.h:15: class GrResourceKey {
This is lifted from GrResourceCache.h with the following additions:

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h#...
include/gpu/GrResourceKey.h:71: // A key indicating that the resource is not
usable as a scratch resource.
here

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h#...
include/gpu/GrResourceKey.h:79: bool isNullScratch() const {
here

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h#...
include/gpu/GrResourceKey.h:94: static ResourceType NoneResourceType() {
here

[robertphillips, 2014-08-27 19:11:30]

lgtm + doc requests, some formatting/naming suggestions & a question

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrGpuResource.h
File include/gpu/GrGpuResource.h (right):

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrGpuResource.h#...
include/gpu/GrGpuResource.h:85: 
// If this resource can be used as a scratch resource this returns a valid
scratch key. Otherwise it returns a key for which isNullScratch will be true.

?

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h
File include/gpu/GrResourceKey.h (right):

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h#...
include/gpu/GrResourceKey.h:36: 
one line ?

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h#...
include/gpu/GrResourceKey.h:40: 
one line ?

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h#...
include/gpu/GrResourceKey.h:48: 
one line ?

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h#...
include/gpu/GrResourceKey.h:94: static ResourceType NoneResourceType() {
type -> gNoneResourceType ?

https://codereview.chromium.org/510053003/diff/1/src/gpu/GrGpuResource.cpp
File src/gpu/GrGpuResource.cpp (right):

https://codereview.chromium.org/510053003/diff/1/src/gpu/GrGpuResource.cpp#ne...
src/gpu/GrGpuResource.cpp:77: SkASSERT(fScratchKey.isNullScratch());
Do we want to assert that scratchKey is not null ?

https://codereview.chromium.org/510053003/diff/1/src/gpu/GrResourceCache2.h
File src/gpu/GrResourceCache2.h (right):

https://codereview.chromium.org/510053003/diff/1/src/gpu/GrResourceCache2.h#n...
src/gpu/GrResourceCache2.h:54: SkTInternalLList<GrGpuResource>     fResources;
// All resources that can be used as scratch can be found in 'fScratchMap'.
// The suitability of a potential scratch resource for a particular
// use (e.g., holding a loaded texture) will be determined by
// the pending operations (e.g., pending reads or writes).

?

[bsalomon, 2014-08-27 20:37:40]

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrGpuResource.h
File include/gpu/GrGpuResource.h (right):

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrGpuResource.h#...
include/gpu/GrGpuResource.h:85: 
On 2014/08/27 19:11:29, robertphillips wrote:
> // If this resource can be used as a scratch resource this returns a valid
> scratch key. Otherwise it returns a key for which isNullScratch will be true.
> 
> ?

Done.

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h
File include/gpu/GrResourceKey.h (right):

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h#...
include/gpu/GrResourceKey.h:36: 
On 2014/08/27 19:11:29, robertphillips wrote:
> one line ?

Done.

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h#...
include/gpu/GrResourceKey.h:40: 
On 2014/08/27 19:11:29, robertphillips wrote:
> one line ?

Done.

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h#...
include/gpu/GrResourceKey.h:48: 
On 2014/08/27 19:11:30, robertphillips wrote:
> one line ?

Done.

https://codereview.chromium.org/510053003/diff/1/include/gpu/GrResourceKey.h#...
include/gpu/GrResourceKey.h:94: static ResourceType NoneResourceType() {
On 2014/08/27 19:11:29, robertphillips wrote:
> type -> gNoneResourceType ?

Done.

https://codereview.chromium.org/510053003/diff/1/src/gpu/GrGpuResource.cpp
File src/gpu/GrGpuResource.cpp (right):

https://codereview.chromium.org/510053003/diff/1/src/gpu/GrGpuResource.cpp#ne...
src/gpu/GrGpuResource.cpp:77: SkASSERT(fScratchKey.isNullScratch());
On 2014/08/27 19:11:30, robertphillips wrote:
> Do we want to assert that scratchKey is not null ?

Done.

https://codereview.chromium.org/510053003/diff/1/src/gpu/GrResourceCache2.h
File src/gpu/GrResourceCache2.h (right):

https://codereview.chromium.org/510053003/diff/1/src/gpu/GrResourceCache2.h#n...
src/gpu/GrResourceCache2.h:54: SkTInternalLList<GrGpuResource>     fResources;
I don't think I want to document the whole scratch recycling mechanism here. I
put a simple comment and will add more comments as the functionality comes
online.

[bsalomon, 2014-08-27 20:38:04]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-08-27 20:38:23]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/bsalomon@google.com/510053003/20001

[commit-bot: I haz the power, 2014-08-27 20:45:14]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  Build-Mac10.8-Clang-x86_64-Release-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Mac10.8-Clang-x86_64-Release-Trybo...)
  Build-Ubuntu13.10-Clang-x86_64-Debug-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Ubuntu13.10-Clang-x86_64-Debug-Try...)
  Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Android-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Andr...)
  Build-Ubuntu13.10-GCC4.8-x86_64-Release-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Ubuntu13.10-GCC4.8-x86_64-Release-...)
  Build-Win-VS2013-x86-Debug-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Win-VS2013-x86-Debug-Trybot/builds...)

[commit-bot: I haz the power, 2014-08-27 20:46:43]

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

[commit-bot: I haz the power, 2014-08-27 20:46:44]

Try jobs failed on following builders:
  Build-Ubuntu13.10-Clang-x86_64-Debug-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Ubuntu13.10-Clang-x86_64-Debug-Try...)

[bsalomon, 2014-08-28 14:04:51]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-08-28 14:05:17]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/bsalomon@google.com/510053003/40001

[bsalomon, 2014-08-28 14:10:57]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-08-28 14:11:01]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/bsalomon@google.com/510053003/60001

[bsalomon, 2014-08-28 14:14:34]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-08-28 14:14:41]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/bsalomon@google.com/510053003/80001

[commit-bot: I haz the power, 2014-08-28 14:44:12]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  Build-Mac10.8-Clang-x86_64-Release-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Mac10.8-Clang-x86_64-Release-Trybo...)
  Build-Ubuntu13.10-Clang-x86_64-Debug-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Ubuntu13.10-Clang-x86_64-Debug-Try...)
  Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Android-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Andr...)
  Build-Ubuntu13.10-GCC4.8-x86_64-Release-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Ubuntu13.10-GCC4.8-x86_64-Release-...)
  Build-Win-VS2013-x86-Debug-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Win-VS2013-x86-Debug-Trybot/builds...)

[commit-bot: I haz the power, 2014-08-28 14:46:21]

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

[commit-bot: I haz the power, 2014-08-28 14:46:22]

Try jobs failed on following builders:
  Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Android-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Andr...)

[bsalomon, 2014-08-28 14:58:43]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-08-28 14:59:31]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/bsalomon@google.com/510053003/120001

[commit-bot: I haz the power, 2014-08-28 16:54:39]

Committed patchset #7 (id:120001) as 744998e666073166307d2522847b2536000a7619