From 36122e74c1d34983b60ca9dcf8cb4bed6bde7d40 Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Thu, 26 Apr 2018 10:59:57 -0400 Subject: remove GrBackendObject from example fiddles R=robertphillips@google.com Docs-Preview: https://skia.org/?cl=123930 Bug: skia:6898 Change-Id: If579d0e0c0323a86d6ab86056b36f8660cbbde6f Reviewed-on: https://skia-review.googlesource.com/123930 Reviewed-by: Robert Phillips Commit-Queue: Cary Clark --- site/user/api/SkImage_Reference.md | 33 ----------------- site/user/api/SkSurface_Reference.md | 69 +----------------------------------- site/user/api/catalog.htm | 40 --------------------- 3 files changed, 1 insertion(+), 141 deletions(-) (limited to 'site') diff --git a/site/user/api/SkImage_Reference.md b/site/user/api/SkImage_Reference.md index ecd59f5bbf..2f491b01a1 100644 --- a/site/user/api/SkImage_Reference.md +++ b/site/user/api/SkImage_Reference.md @@ -125,7 +125,6 @@ drawing. | dimensions | returns width and height | | encodeToData | returns encoded Image as SkData | | getBackendTexture | returns GPU reference to Image as texture | -| getTextureHandle | returns GPU reference to Image as texture | | height | returns pixel row count | | isAlphaOnly | returns if pixels represent a transparency mask | | isLazyGenerated | returns if Image is created as needed | @@ -897,7 +896,6 @@ created Image, or nullptr | colorType | returns Color Type | | dimensions | returns width and height | | getBackendTexture | returns GPU reference to Image as texture | -| getTextureHandle | returns GPU reference to Image as texture | | height | returns pixel row count | | isAlphaOnly | returns if pixels represent a transparency mask | | isLazyGenerated | returns if Image is created as needed | @@ -1411,37 +1409,6 @@ true if Image can be drawn GrBackendObject getTextureHandle(bool flushPendingGrContextIO, GrSurfaceOrigin* origin = nullptr) const -Retrieves the back-end API handle of texture. If flushPendingGrContextIO is true, -complete deferred I/O operations. - -If origin is not nullptr, copies location of content drawn into Image. - -### Parameters - - - - -
flushPendingGrContextIO -flag to flush outstanding requests
origin -storage for one of: kTopLeft GrSurfaceOrigin, -kBottomLeft GrSurfaceOrigin; or nullptr
- -### Return Value - -back-end API texture handle, or nullptr - -### Example - -
- -### Example - -
- -### See Also - -MakeFromTexture[2] isTextureBacked - --- diff --git a/site/user/api/SkSurface_Reference.md b/site/user/api/SkSurface_Reference.md index cf9493f8a4..9d81ab2949 100644 --- a/site/user/api/SkSurface_Reference.md +++ b/site/user/api/SkSurface_Reference.md @@ -52,8 +52,6 @@ of the requested dimensions are zero, then nullptr will be returned. | getBackendRenderTarget | returns the GPU reference to render target | | getBackendTexture | returns the GPU reference to texture | | getCanvas | returns Canvas that draws into Surface | -| getRenderTargetHandle | returns the GPU reference to render target | -| getTextureHandle | returns the GPU reference to texture | | height | returns pixel row count | | makeImageSnapshot | creates Image capturing Surface contents | | makeSurface | creates a compatible Surface | @@ -808,8 +806,6 @@ surf->makeImageSnapshot() == nullptr | getBackendRenderTarget | returns the GPU reference to render target | | getBackendTexture | returns the GPU reference to texture | | getCanvas | returns Canvas that draws into Surface | -| getRenderTargetHandle | returns the GPU reference to render target | -| getTextureHandle | returns the GPU reference to texture | | height | returns pixel row count | | props | returns Surface Properties | | width | returns pixel column count | @@ -1019,13 +1015,9 @@ one of: kDiscard ContentChangeMo -### Example - -
- ### See Also -getTextureHandle getRenderTargetHandle +getBackendTexture getBackendRenderTarget @@ -1036,32 +1028,6 @@ one of: kDiscard ContentChangeMo GrBackendObject getTextureHandle(BackendHandleAccess backendHandleAccess) -Returns the GPU back-end reference of the texture used by Surface, or zero -if Surface is not backed by a GPU texture. - -The returned texture handle is only valid until the next draw into Surface, -or when Surface is deleted. - -### Parameters - - - -
backendHandleAccess -one of: kFlushRead BackendHandleAccess, -kFlushWrite BackendHandleAccess, kDiscardWrite BackendHandleAccess
- -### Return Value - -GPU texture reference - -### Example - -
- -### See Also - -getRenderTargetHandle GrBackendObject BackendHandleAccess - --- @@ -1071,39 +1037,6 @@ GPU texture reference bool getRenderTargetHandle(GrBackendObject* backendObject, BackendHandleAccess backendHandleAccess) -Returns true and stores the GPU back-end reference of the render target used -by Surface in backendObject. - -Return false if Surface is not backed by a GPU render target, and leaves -backendObject unchanged. - -The returned render target handle is only valid until the next draw into Surface, -or when Surface is deleted. - -In OpenGL this returns the frame buffer object ID. - -### Parameters - - - - -
backendObject -GPU intermediate memory buffer
backendHandleAccess -one of: kFlushRead BackendHandleAccess, -kFlushWrite BackendHandleAccess, kDiscardWrite BackendHandleAccess
- -### Return Value - -true if Surface is backed by GPU texture - -### Example - -
- -### See Also - -getTextureHandle GrBackendObject BackendHandleAccess - --- diff --git a/site/user/api/catalog.htm b/site/user/api/catalog.htm index 7f05b27c14..6c132e054d 100644 --- a/site/user/api/catalog.htm +++ b/site/user/api/catalog.htm @@ -5474,22 +5474,6 @@ "hash": "d093aad721261f421c4bef4a296aab48", "file": "SkImage_Reference", "name": "SkImage::getBackendTexture" -}, - "SkImage_getTextureHandle": { - "code": "void draw(SkCanvas* canvas) {\n GrContext* context = canvas->getGrContext();\n if (!context) {\n return;\n }\n SkPaint paint;\n paint.setAntiAlias(true);\n SkString str;\n int y = -10;\n for (auto origin : { kTopLeft_GrSurfaceOrigin, kBottomLeft_GrSurfaceOrigin } ) {\n sk_sp srcImage(SkImage::MakeFromTexture(context,\n backEndTexture, origin, kN32_SkColorType, kPremul_SkAlphaType, nullptr));\n GrSurfaceOrigin readBackOrigin;\n GrBackendObject readBackHandle = srcImage->getTextureHandle(false, &readBackOrigin);\n str.printf(\"readBackHandle: 0x%lx\", readBackHandle);\n canvas->drawString(str, 5, y += 30, paint);\n canvas->drawImage(srcImage, 80, y += 10);\n str.printf(\"origin: k%s_GrSurfaceOrigin\", readBackOrigin ? \"BottomLeft\" : \"TopLeft\");\n canvas->drawString(str, 5, y += srcImage->height() + 10, paint);\n }\n}", - "width": 256, - "height": 256, - "hash": "c321079049b0363c3b53bb76991768d4", - "file": "SkImage_Reference", - "name": "SkImage::getTextureHandle" -}, - "SkImage_getTextureHandle_a": { - "code": "void draw(SkCanvas* canvas) {\n auto drawImage = [=](sk_sp image, const char* label) -> void {\n if (nullptr == image) {\n return;\n }\n SkPaint paint;\n paint.setAntiAlias(true);\n paint.setTextAlign(SkPaint::kCenter_Align);\n canvas->drawImage(image, 0, image->height() / 4);\n canvas->drawString(label, image->width() / 2, image->height() / 8, paint);\n GrSurfaceOrigin readBackOrigin;\n GrBackendObject readBackHandle = image->getTextureHandle(false, &readBackOrigin);\n canvas->drawString(readBackHandle ? \"has readBackHandle\" : \"no readBackHandle\",\n image->width() / 2, image->height() * 11 / 8, paint);\n };\n drawImage(image, \"image\");\n canvas->translate(image->width(), 0);\n sk_sp textureImage(SkImage::MakeFromTexture(canvas->getGrContext(), backEndTexture,\n kTopLeft_GrSurfaceOrigin, kN32_SkColorType, kOpaque_SkAlphaType,\n nullptr));\n drawImage(textureImage, \"backEndTexture\");\n}", - "width": 256, - "height": 256, - "hash": "7161810a96a75540c55af0021a1e5bb9", - "file": "SkImage_Reference", - "name": "SkImage::getTextureHandle_2" }, "SkImage_height": { "code": "void draw(SkCanvas* canvas) {\n canvas->translate(10, 10);\n canvas->drawImage(image, 0, 0);\n canvas->translate(image->width(), 0);\n SkPaint paint;\n paint.setTextAlign(SkPaint::kCenter_Align);\n paint.setVerticalText(true);\n canvas->drawLine(10, 0, 10, image->height(), paint);\n canvas->drawString(\"height\", 25, image->height() / 2, paint);\n}", @@ -7266,14 +7250,6 @@ "hash": "882e8e0103048009a25cfc20400492f7", "file": "SkColor_Reference", "name": "SkRGBToHSV" -}, - "SkSurface_BackendHandleAccess": { - "code": "void draw(SkCanvas* canvas) {\n SkPaint paint;\n paint.setTextSize(32);\n GrContext* context = canvas->getGrContext();\n if (!context) {\n canvas->drawString(\"GPU only!\", 20, 40, paint);\n return;\n }\n sk_sp gpuSurface = SkSurface::MakeRenderTarget(\n context, SkBudgeted::kYes, SkImageInfo::MakeN32Premul(10, 10));\n int y = 20;\n SkString str;\n paint.setTextSize(16);\n for (auto access : { SkSurface::kFlushRead_BackendHandleAccess, \n SkSurface::kFlushWrite_BackendHandleAccess,\n SkSurface::kDiscardWrite_BackendHandleAccess } ) {\n sk_sp image(gpuSurface->makeImageSnapshot());\n str.printf(\"uniqueID=%d\", image->uniqueID());\n canvas->drawString(str, 20, y += 20, paint);\n GrBackendObject backendObject = gpuSurface->getTextureHandle(access);\n str.printf(\"backendObject %c= 0\", backendObject != 0 ? '!' : '=');\n canvas->drawString(str, 20, y += 20, paint);\n }\n sk_sp image(gpuSurface->makeImageSnapshot());\n str.printf(\"final image uniqueID=%d\", image->uniqueID());\n canvas->drawString(str, 20, y += 20, paint);\n}", - "width": 256, - "height": 256, - "hash": "260a5ba014b00eeb5a74b3c6b8d31be4", - "file": "SkSurface_Reference", - "name": "SkSurface::BackendHandleAccess" }, "SkSurface_MakeFromBackendTexture": { "code": "void draw(SkCanvas* canvas) {\n SkPaint paint;\n paint.setTextSize(32);\n GrContext* context = canvas->getGrContext();\n if (!context) {\n canvas->drawString(\"GPU only!\", 20, 40, paint);\n return;\n }\n sk_sp gpuSurface = SkSurface::MakeFromBackendTexture(context,\n backEndTexture, kTopLeft_GrSurfaceOrigin, 0,\n kRGBA_8888_SkColorType, nullptr, nullptr);\n auto surfaceCanvas = gpuSurface->getCanvas();\n surfaceCanvas->drawString(\"GPU rocks!\", 20, 40, paint);\n sk_sp image(gpuSurface->makeImageSnapshot());\n canvas->drawImage(image, 0, 0);\n}", @@ -7346,22 +7322,6 @@ "hash": "33d0c5ad5a4810e533ae1010e29f8b75", "file": "SkSurface_Reference", "name": "SkSurface::getCanvas" -}, - "SkSurface_getRenderTargetHandle": { - "code": "void draw(SkCanvas* canvas) {\n SkPaint paint;\n paint.setTextSize(32);\n GrContext* context = canvas->getGrContext();\n if (!context) {\n canvas->drawString(\"GPU only!\", 20, 40, paint);\n return;\n }\n sk_sp gpuSurface = SkSurface::MakeRenderTarget(\n context, SkBudgeted::kYes, SkImageInfo::MakeN32Premul(10, 10));\n GrBackendObject backendObject;\n if (gpuSurface->getRenderTargetHandle(&backendObject, \n SkSurface::kFlushRead_BackendHandleAccess)) {\n SkString str;\n str.printf(\"backendObject=%ld\", backendObject);\n paint.setTextSize(16);\n canvas->drawString(str, 20, 40, paint);\n }\n}", - "width": 256, - "height": 64, - "hash": "dbc6c0e01a177ba03c87c00c32a43148", - "file": "SkSurface_Reference", - "name": "SkSurface::getRenderTargetHandle" -}, - "SkSurface_getTextureHandle": { - "code": "void draw(SkCanvas* canvas) {\n SkPaint paint;\n paint.setTextSize(32);\n GrContext* context = canvas->getGrContext();\n if (!context) {\n canvas->drawString(\"GPU only!\", 20, 40, paint);\n return;\n }\n sk_sp gpuSurface = SkSurface::MakeRenderTarget(\n context, SkBudgeted::kYes, SkImageInfo::MakeN32Premul(10, 10));\n GrBackendObject backendObject = gpuSurface->getTextureHandle(\n SkSurface::kFlushRead_BackendHandleAccess);\n if (backendObject) {\n SkString str;\n str.printf(\"backendObject=%08lx\", backendObject);\n paint.setTextSize(16);\n canvas->drawString(str, 20, 40, paint);\n }\n}", - "width": 256, - "height": 64, - "hash": "f7558a62985f70f2286307993db4b3bc", - "file": "SkSurface_Reference", - "name": "SkSurface::getTextureHandle" }, "SkSurface_makeImageSnapshot": { "code": "void draw(SkCanvas* canvas) {\n sk_sp big(SkSurface::MakeRasterN32Premul(64, 64));\n sk_sp lil(big->makeSurface(SkImageInfo::MakeN32(32, 32, kPremul_SkAlphaType)));\n big->getCanvas()->clear(SK_ColorRED);\n lil->getCanvas()->clear(SK_ColorBLACK);\n sk_sp early(big->makeImageSnapshot());\n lil->draw(big->getCanvas(), 16, 16, nullptr);\n sk_sp later(big->makeImageSnapshot());\n canvas->drawImage(early, 0, 0);\n canvas->drawImage(later, 128, 0);\n}", -- cgit v1.2.3