f10b2a58a3c7a807fd56ea44be488327cdabe8cf - platform/external/skia

commit	f10b2a58a3c7a807fd56ea44be488327cdabe8cf	[log] [tgz]
author	Robert Phillips <robertphillips@google.com>	Fri May 15 10:20:04 2020 -0400
committer	Skia Commit-Bot <skia-commit-bot@chromium.org>	Fri May 15 15:49:25 2020 +0000
tree	27b14f2d4c6555305d82c9b8940fecfd8b529d4f
parent	6ef29333cb31c309e3d79fbb20d68ab4062abc78 [diff]

Loosen up uniqueKey asserts between GrTextureProxy and GrTexture in DDLs (alt. version)

When recording a DDL it is possible for a uniquely keyed resource to lose its uniqueKey in the direct context (and its proxyProvider) while the DDL's proxyProvider still has a proxy with a uniqueKey.

Bug: 1056730
Change-Id: I565b08a8eb280aea19fc3052c758e059392a4c12
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/289890
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

include/private/GrTypesPriv.h[diff]
src/gpu/GrProxyProvider.cpp[diff]
src/gpu/GrProxyProvider.h[diff]
src/gpu/GrTextureProxy.cpp[diff]
src/gpu/GrTextureProxy.h[diff]
src/gpu/GrTextureRenderTargetProxy.cpp[diff]
src/gpu/GrTextureRenderTargetProxy.h[diff]

7 files changed