Have GrSurfaceProxys and GrGpuResources draw from the same pool of unique ids

Have GrSurfaceProxys and GrGpuResources draw from the same pool of unique ids

The idea here is that, for wrapped Proxy objects, we want the uniqueID to reflect that of the wrapped object. For this to work the IDs for the non-wrapped versions can't conflict with GrGpuResource's pool of IDs.

Split off of: https://codereview.chromium.org/2215323003/ (Start using RenderTargetProxy (omnibus))

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2301523003

Committed: https://skia.googlesource.com/skia/+/8abb370aca280516f4861c6c942ec453aad018fa

[robertphillips, 2016-08-31 16:46:54]

Description was changed from

==========
Have GrSurfaceProxys and GrSurfaces draw from the same pool of unique ids
==========

to

==========
Have GrSurfaceProxys and GrSurfaces draw from the same pool of unique ids
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2301523003
==========

[robertphillips, 2016-08-31 16:48:31]

Description was changed from

==========
Have GrSurfaceProxys and GrSurfaces draw from the same pool of unique ids
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2301523003
==========

to

==========
Have GrSurfaceProxys and GrSurfaces draw from the same pool of unique ids

The idea here is that, for wrapped Proxy objects, we want the uniqueID to
reflect that of the wrapped object. For this to work the IDs for the non-wrapped
versions can't conflict with GrSurface's pool of IDs.

Split off of: https://codereview.chromium.org/2215323003/ (Start using
RenderTargetProxy (omnibus))

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2301523003
==========

[robertphillips, 2016-08-31 16:48:31]

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

[robertphillips, 2016-08-31 16:49:26]

Description was changed from

==========
Have GrSurfaceProxys and GrSurfaces draw from the same pool of unique ids

The idea here is that, for wrapped Proxy objects, we want the uniqueID to
reflect that of the wrapped object. For this to work the IDs for the non-wrapped
versions can't conflict with GrSurface's pool of IDs.

Split off of: https://codereview.chromium.org/2215323003/ (Start using
RenderTargetProxy (omnibus))

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2301523003
==========

to

==========
Have GrSurfaceProxys and GrGpuResources draw from the same pool of unique ids

The idea here is that, for wrapped Proxy objects, we want the uniqueID to
reflect that of the wrapped object. For this to work the IDs for the non-wrapped
versions can't conflict with GrGpuResource's pool of IDs.

Split off of: https://codereview.chromium.org/2215323003/ (Start using
RenderTargetProxy (omnibus))

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2301523003
==========

[robertphillips, 2016-08-31 16:54:22]

The CQ bit was checked by robertphillips@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-08-31 16:54:33]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-31 16:55:21]

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

[commit-bot: I haz the power, 2016-08-31 16:55:22]

Dry run: Try jobs failed on following builders:
  Build-Ubuntu-GCC-Arm64-Debug-Android-Trybot on master.client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm...)
  Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot on master.client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm...)
  Build-Ubuntu-GCC-Mips-Debug-Android-Trybot on master.client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Mip...)

[robertphillips, 2016-08-31 17:20:39]

The CQ bit was checked by robertphillips@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-08-31 17:20:41]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-31 17:21:32]

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

[commit-bot: I haz the power, 2016-08-31 17:21:34]

Dry run: Try jobs failed on following builders:
  Build-Ubuntu-GCC-Arm64-Debug-Android-Trybot on master.client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm...)
  Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot on master.client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm...)
  Build-Ubuntu-GCC-Mips-Debug-Android-Trybot on master.client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Mip...)

[bsalomon, 2016-08-31 17:53:18]

https://codereview.chromium.org/2301523003/diff/40001/include/gpu/GrGpuResour...
File include/gpu/GrGpuResource.h (right):

https://codereview.chromium.org/2301523003/diff/40001/include/gpu/GrGpuResour...
include/gpu/GrGpuResource.h:282: friend class GrSurfaceProxy; // for access to
CreateUniqueID
Is there a lighter weight way we could do this? I think I'd prefer making
CreateUniqueID() public to friending.

https://codereview.chromium.org/2301523003/diff/40001/include/private/GrSurfa...
File include/private/GrSurfaceProxy.h (right):

https://codereview.chromium.org/2301523003/diff/40001/include/private/GrSurfa...
include/private/GrSurfaceProxy.h:29: uint32_t getUniqueID() const { return
fUniqueID; }
Can we go the other way :)

[robertphillips, 2016-08-31 19:11:38]

https://codereview.chromium.org/2301523003/diff/40001/include/gpu/GrGpuResour...
File include/gpu/GrGpuResource.h (right):

https://codereview.chromium.org/2301523003/diff/40001/include/gpu/GrGpuResour...
include/gpu/GrGpuResource.h:282: friend class GrSurfaceProxy; // for access to
CreateUniqueID
On 2016/08/31 17:53:18, bsalomon wrote:
> Is there a lighter weight way we could do this? I think I'd prefer making
> CreateUniqueID() public to friending.

Done. Made it public.

https://codereview.chromium.org/2301523003/diff/40001/include/private/GrSurfa...
File include/private/GrSurfaceProxy.h (right):

https://codereview.chromium.org/2301523003/diff/40001/include/private/GrSurfa...
include/private/GrSurfaceProxy.h:29: uint32_t getUniqueID() const { return
fUniqueID; }
On 2016/08/31 17:53:18, bsalomon wrote:
> Can we go the other way :)

Done.

[robertphillips, 2016-08-31 19:11:46]

The CQ bit was checked by robertphillips@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-08-31 19:11:52]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-31 19:13:01]

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

[commit-bot: I haz the power, 2016-08-31 19:13:02]

Dry run: Try jobs failed on following builders:
  Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-GN-Trybot on master.client.skia
(JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2...)
  Build-Mac-Clang-x86_64-Release-GN-Trybot on master.client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-x86_...)
  Build-Ubuntu-Clang-arm-Debug-GN_Android-Trybot on master.client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-Clang-a...)
  Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot on master.client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-Clang-a...)
  Build-Ubuntu-Clang-mips64el-Debug-GN_Android-Trybot on
master.client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-Clang-m...)
  Build-Ubuntu-Clang-x86_64-Debug-GN-Trybot on master.client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-Clang-x...)
  Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot on master.client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86...)
  Build-Ubuntu-GCC-x86_64-Release-GN-Trybot on master.client.skia.compile
(JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86...)

[robertphillips, 2016-08-31 19:28:00]

The CQ bit was checked by robertphillips@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-08-31 19:28:19]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-31 19:53:12]

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

[commit-bot: I haz the power, 2016-08-31 19:53:13]

Dry run: This issue passed the CQ dry run.

[bsalomon, 2016-08-31 20:27:51]

lgtm

[robertphillips, 2016-08-31 21:02:40]

The CQ bit was checked by robertphillips@google.com

[commit-bot: I haz the power, 2016-08-31 21:02:45]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-31 21:04:08]

Description was changed from

==========
Have GrSurfaceProxys and GrGpuResources draw from the same pool of unique ids

The idea here is that, for wrapped Proxy objects, we want the uniqueID to
reflect that of the wrapped object. For this to work the IDs for the non-wrapped
versions can't conflict with GrGpuResource's pool of IDs.

Split off of: https://codereview.chromium.org/2215323003/ (Start using
RenderTargetProxy (omnibus))

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2301523003
==========

to

==========
Have GrSurfaceProxys and GrGpuResources draw from the same pool of unique ids

The idea here is that, for wrapped Proxy objects, we want the uniqueID to
reflect that of the wrapped object. For this to work the IDs for the non-wrapped
versions can't conflict with GrGpuResource's pool of IDs.

Split off of: https://codereview.chromium.org/2215323003/ (Start using
RenderTargetProxy (omnibus))

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2301523003

Committed:
https://skia.googlesource.com/skia/+/8abb370aca280516f4861c6c942ec453aad018fa
==========

[commit-bot: I haz the power, 2016-08-31 21:04:10]

Committed patchset #5 (id:80001) as
https://skia.googlesource.com/skia/+/8abb370aca280516f4861c6c942ec453aad018fa