diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-05-03 16:54:03 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-10 14:44:55 +0000 |
| commit | ccd4cfc23ebbbecbc6b292359352aad335ad7b73 (patch) | |
| tree | 88940d88f16be8fe4bd943e0264b4c9f4b531ad7 /docs | |
| parent | f77db110e1c4d2b813ed40de0cf63f65f84b4b64 (diff) | |
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 <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/SkImage_Reference.bmh | 7 | ||||
| -rw-r--r-- | docs/SkSurface_Reference.bmh | 23 |
2 files changed, 5 insertions, 25 deletions
diff --git a/docs/SkImage_Reference.bmh b/docs/SkImage_Reference.bmh index 9cf69d7adb..7f66ccca32 100644 --- a/docs/SkImage_Reference.bmh +++ b/docs/SkImage_Reference.bmh @@ -1322,13 +1322,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 0c4b43483b..1f09a964b7 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<SkImage> 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<SkImage> image(gpuSurface->makeImageSnapshot()); @@ -996,19 +996,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 ## @@ -1592,8 +1579,8 @@ and the client will still own the semaphores. context, SkBudgeted::kYes, SkImageInfo::MakeN32Premul(64, 64)); surface->flushAndSignalSemaphores(1, &semaphore); sk_sp<SkImage> 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<SkSurface> childSurface(SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, |