From 044d3c185876f9960f07b88f068cf08d78311e33 Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 6 Apr 2016 18:24:34 -0700 Subject: Revert of Track GL buffer state based on unique resource ID (patchset #6 id:100001 of https://codereview.chromium.org/1854283004/ ) Reason for revert: Chrome roll's broken, seems to be missing fTarget: https://codereview.chromium.org/1861473005 Original issue's description: > Track GL buffer state based on unique resource ID > > Reworks GrGLGpu to track GL buffer state based on the unique > GrGpuResource ID. This eliminates the need to notify the gpu object > whenever a buffer is deleted. > > This change also allows us to remove the type specifier from GrBuffer. > At this point a buffer is just a chunk of memory, and the type > given at creation time is just a suggestion to the GL backend about > which target to bind to for updates. > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1854283004 > > Committed: https://skia.googlesource.com/skia/+/deacc97bc63513b5eacaf21f858727f6e8b98ce5 TBR=bsalomon@google.com,jvanverth@google.com,cdalton@nvidia.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1870553002 --- include/gpu/GrTypesPriv.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'include/gpu') diff --git a/include/gpu/GrTypesPriv.h b/include/gpu/GrTypesPriv.h index 39386f0140..bf8ea49063 100644 --- a/include/gpu/GrTypesPriv.h +++ b/include/gpu/GrTypesPriv.h @@ -406,22 +406,11 @@ private: enum GrBufferType { kVertex_GrBufferType, kIndex_GrBufferType, - kTexel_GrBufferType, - kDrawIndirect_GrBufferType, kXferCpuToGpu_GrBufferType, kXferGpuToCpu_GrBufferType, kLast_GrBufferType = kXferGpuToCpu_GrBufferType }; -static const int kGrBufferTypeCount = kLast_GrBufferType + 1; - -static inline bool GrBufferTypeIsVertexOrIndex(GrBufferType type) { - SkASSERT(type >= 0 && type < kGrBufferTypeCount); - return type <= kIndex_GrBufferType; - - GR_STATIC_ASSERT(0 == kVertex_GrBufferType); - GR_STATIC_ASSERT(1 == kIndex_GrBufferType); -} /** * Provides a performance hint regarding the frequency at which a data store will be accessed. -- cgit v1.2.3