8abb370aca280516f4861c6c942ec453aad018fa - platform/external/skqp

commit	8abb370aca280516f4861c6c942ec453aad018fa	[log] [tgz]
author	robertphillips <robertphillips@google.com>	Wed Aug 31 14:04:06 2016 -0700
committer	Commit bot <commit-bot@chromium.org>	Wed Aug 31 14:04:06 2016 -0700
tree	b7e1c12fab48df526ba92763add2aca80806d554
parent	bde96c6263112de755a2573f6f5f02703386f328 [diff]

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

Review-Url: https://codereview.chromium.org/2301523003

include/gpu/GrGpuResource.h[diff]
include/private/GrSurfaceProxy.h[diff]
include/private/GrTextureProxy.h[diff]
src/gpu/GrDrawTarget.cpp[diff]
src/gpu/GrGpuResource.cpp[diff]
src/gpu/GrRenderTargetProxy.cpp[diff]
src/gpu/GrSurfaceProxy.cpp[diff]
src/gpu/GrTextureProxy.cpp[diff]
src/gpu/batches/GrClearBatch.h[diff]
src/gpu/batches/GrClearStencilClipBatch.h[diff]
src/gpu/batches/GrCopySurfaceBatch.h[diff]
src/gpu/batches/GrDiscardBatch.h[diff]
src/gpu/batches/GrDrawBatch.h[diff]
src/gpu/batches/GrStencilPathBatch.h[diff]
src/gpu/effects/GrSingleTextureEffect.h[diff]
src/gpu/gl/GrGLGpu.cpp[diff]
src/gpu/gl/GrGLRenderTarget.cpp[diff]
src/gpu/gl/GrGLTextureRenderTarget.cpp[diff]
src/gpu/gl/GrGLVertexArray.cpp[diff]
src/gpu/instanced/GLInstancedRendering.cpp[diff]
src/gpu/text/GrStencilAndCoverTextContext.cpp[diff]
tests/ClearTest.cpp[diff]
tests/ProxyTest.cpp[diff]
tests/ResourceCacheTest.cpp[diff]
tests/SurfaceTest.cpp[diff]
tools/debugger/SkDebugCanvas.cpp[diff]

26 files changed