From 6d138bf681eee54a8b4a40e5dbbd08a137ae0d93 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Thu, 3 May 2018 16:54:03 -0400 Subject: Reland "Remove GrBackendObject and all related functions from Skia." This is a reland of ccd4cfc23ebbbecbc6b292359352aad335ad7b73 Original change's description: > Remove GrBackendObject and all related functions from Skia. > > Bug: skia: > Change-Id: I59434b7477c0bc26fd982bd81eb97ab94bbba073 > Reviewed-on: https://skia-review.googlesource.com/125822 > Reviewed-by: Brian Salomon > Commit-Queue: Greg Daniel Bug: skia: Change-Id: Ibd1b9bd04b36840d9d872e2f0970dd6bac378bc9 Reviewed-on: https://skia-review.googlesource.com/129380 Reviewed-by: Greg Daniel Commit-Queue: Greg Daniel --- docs/SkImage_Reference.bmh | 7 ------- docs/SkSurface_Reference.bmh | 21 ++++----------------- 2 files changed, 4 insertions(+), 24 deletions(-) (limited to 'docs') diff --git a/docs/SkImage_Reference.bmh b/docs/SkImage_Reference.bmh index 4f2549b03a..614115cf01 100644 --- a/docs/SkImage_Reference.bmh +++ b/docs/SkImage_Reference.bmh @@ -1336,13 +1336,6 @@ drawImage(textureImage, "backEndTexture"); # ------------------------------------------------------------------------------ -#Method GrBackendObject getTextureHandle(bool flushPendingGrContextIO, - GrSurfaceOrigin* origin = nullptr) const -#Deprecated -#Method ## - -# ------------------------------------------------------------------------------ - #Method GrBackendTexture getBackendTexture(bool flushPendingGrContextIO, GrSurfaceOrigin* origin = nullptr) const #In Property diff --git a/docs/SkSurface_Reference.bmh b/docs/SkSurface_Reference.bmh index 30a3d8fd60..b4faad3224 100644 --- a/docs/SkSurface_Reference.bmh +++ b/docs/SkSurface_Reference.bmh @@ -988,8 +988,8 @@ Caller must overwrite the entire back-end object. sk_sp image(gpuSurface->makeImageSnapshot()); str.printf("uniqueID=%d", image->uniqueID()); canvas->drawString(str, 20, y += 20, paint); - GrBackendObject backendObject = gpuSurface->getTextureHandle(access); - str.printf("backendObject %c= 0", backendObject != 0 ? '!' : '='); + GrBackendTexture backendTex = gpuSurface->getBackendTexture(access); + str.printf("backendTex is %svalid", backendTex.isValid() ? '' : 'not '); canvas->drawString(str, 20, y += 20, paint); } sk_sp image(gpuSurface->makeImageSnapshot()); @@ -1003,19 +1003,6 @@ Caller must overwrite the entire back-end object. # ------------------------------------------------------------------------------ -#Method GrBackendObject getTextureHandle(BackendHandleAccess backendHandleAccess) -#Deprecated -#Method ## - -# ------------------------------------------------------------------------------ - -#Method bool getRenderTargetHandle(GrBackendObject* backendObject, - BackendHandleAccess backendHandleAccess) -#Deprecated -#Method ## - -# ------------------------------------------------------------------------------ - #Method GrBackendTexture getBackendTexture(BackendHandleAccess backendHandleAccess) #In Property #Line # returns the GPU reference to texture ## @@ -1619,8 +1606,8 @@ and the client will still own the semaphores. context, SkBudgeted::kYes, SkImageInfo::MakeN32Premul(64, 64)); surface->flushAndSignalSemaphores(1, &semaphore); sk_sp image = surface->makeImageSnapshot(); - GrBackendObject backendImage = image->getTextureHandle(false); // unused - SkASSERT(backendImage); + GrBackendTexture backendTex = image->getBackendTexture(false); // unused + SkASSERT(backendTex.isValid()); const SkImageInfo childImageInfo = SkImageInfo::Make(64, 64, kRGBA_8888_SkColorType, kPremul_SkAlphaType); sk_sp childSurface(SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, -- cgit v1.2.3