From 807371c15bd742efb98a9df6e1dee73e8bda8af5 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 20 Jul 2017 20:48:12 +0000 Subject: Revert "Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget." This reverts commit e2d37c2a07f5473e5fc6fb65e9e23e14127580e9. Reason for revert: Original change's description: > Remove GrBackendRenderTargetDesc in favor of GrBackendRenderTarget. > > Also removes a reference to GrBackendTextureDesc in a comment and updates markdown docs. > > Docs-Preview: https://skia.org/?cl=24861 > Bug: skia: > Change-Id: Ic6490d5ef46953450e6dee69271397bb2b94d0d6 > Reviewed-on: https://skia-review.googlesource.com/24861 > Commit-Queue: Brian Salomon > Reviewed-by: Robert Phillips TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: I4b85b529727f0bf5aec21d87e725a8195666e2e5 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/25182 Reviewed-by: Brian Salomon Commit-Queue: Brian Salomon --- site/user/sample/color.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'site/user/sample/color.md') diff --git a/site/user/sample/color.md b/site/user/sample/color.md index 3f4d869504..28d86d396d 100644 --- a/site/user/sample/color.md +++ b/site/user/sample/color.md @@ -116,9 +116,11 @@ can be in any gamut, but must have a linear transfer function. sk_sp MakeFromEncoded(sk_sp encoded); // Create an image from a texture in a particular color space - sk_sp MakeFromTexture(GrContext*, const GrBackendTexture&, - GrSurfaceOrigin, SkAlphaType, sk_sp, - ...); + // Caution: There are versions of this constructor that do not take an + // SkColorSpace. But without an SkColorSpace, Skia does not have + // enough information to draw correctly. + sk_sp MakeFromTexture(GrContext*, const GrBackendTextureDesc&, + SkAlphaType, sk_sp, ...); **SkBitmap** is another (not preferred) representation for image sources. Be careful to not forget the color space. @@ -188,5 +190,4 @@ cannot know how to draw without knowing the color space of the source. It is possible to create **an object that is both a source and destination**, if Skia will both draw into it and then draw it somewhere else. The same rules from above still apply, but it is subtle that the color space tag could have an effect (or no effect) depending on how the object is -used. - +used. \ No newline at end of file -- cgit v1.2.3