From a0ca909142ba4fd33a1b2750f551e7edbb4b98f1 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Thu, 10 May 2018 22:04:08 +0000 Subject: Revert "Remove GrBackendObject and all related functions from Skia." This reverts commit ccd4cfc23ebbbecbc6b292359352aad335ad7b73. Reason for revert: Fuchsia not building again. (Flutter roll may have been reverted?) 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 TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: Ie2c518b84b0c9513c0c622082de2831088b1ad8d No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/127480 Reviewed-by: Brian Osman Commit-Queue: Brian Osman --- docs/SkImage_Reference.bmh | 7 +++++++ docs/SkSurface_Reference.bmh | 23 ++++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/SkImage_Reference.bmh b/docs/SkImage_Reference.bmh index 7f66ccca32..9cf69d7adb 100644 --- a/docs/SkImage_Reference.bmh +++ b/docs/SkImage_Reference.bmh @@ -1322,6 +1322,13 @@ 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 1f09a964b7..0c4b43483b 100644 --- a/docs/SkSurface_Reference.bmh +++ b/docs/SkSurface_Reference.bmh @@ -975,14 +975,14 @@ Caller must overwrite the entire back-end object. int y = 20; SkString str; paint.setTextSize(16); - for (auto access : { SkSurface::kFlushRead_BackendHandleAccess, + for (auto access : { SkSurface::kFlushRead_BackendHandleAccess, SkSurface::kFlushWrite_BackendHandleAccess, SkSurface::kDiscardWrite_BackendHandleAccess } ) { sk_sp image(gpuSurface->makeImageSnapshot()); str.printf("uniqueID=%d", image->uniqueID()); canvas->drawString(str, 20, y += 20, paint); - GrBackendTexture backendTex = gpuSurface->getBackendTexture(access); - str.printf("backendTex is %svalid", backendTex.isValid() ? '' : 'not '); + GrBackendObject backendObject = gpuSurface->getTextureHandle(access); + str.printf("backendObject %c= 0", backendObject != 0 ? '!' : '='); canvas->drawString(str, 20, y += 20, paint); } sk_sp image(gpuSurface->makeImageSnapshot()); @@ -996,6 +996,19 @@ 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 ## @@ -1579,8 +1592,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(); - GrBackendTexture backendTex = image->getBackendTexture(false); // unused - SkASSERT(backendTex.isValid()); + GrBackendObject backendImage = image->getTextureHandle(false); // unused + SkASSERT(backendImage); const SkImageInfo childImageInfo = SkImageInfo::Make(64, 64, kRGBA_8888_SkColorType, kPremul_SkAlphaType); sk_sp childSurface(SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, -- cgit v1.2.3