diff options
author | 2018-02-13 17:02:19 +0000 | |
---|---|---|
committer | 2018-02-13 17:02:31 +0000 | |
commit | 559823d1fee3a9e26170d0ac1f3aaa87b3a3c66a (patch) | |
tree | 74a3eded6110558487836262490e3eb027534e3c /include/gpu/GrCaps.h | |
parent | 8a83ca4e9afc9e3c08b4e8c33a74392f9b3154d7 (diff) |
Revert "Add SkCharacterization creation helper to GrContextThreadSafeProxy"
This reverts commit d76e56d93c27856b10d6636882a5ffcd79a9d967.
Reason for revert: broke NexusPlayer Vulkan
Original change's description:
> Add SkCharacterization creation helper to GrContextThreadSafeProxy
>
> Change-Id: I8ad7cf335f2b586cf501eaa70573690fbbd53efa
> Reviewed-on: https://skia-review.googlesource.com/106105
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I72b75ff700d39839f7207955566e48bb544aaf6b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/106968
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
Diffstat (limited to 'include/gpu/GrCaps.h')
-rw-r--r-- | include/gpu/GrCaps.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h index 1b81b18fcb..0f03f162f0 100644 --- a/include/gpu/GrCaps.h +++ b/include/gpu/GrCaps.h @@ -15,7 +15,6 @@ #include "SkRefCnt.h" #include "SkString.h" -class GrBackendFormat; class GrBackendRenderTarget; class GrBackendTexture; struct GrContextOptions; @@ -201,7 +200,7 @@ public: bool validateSurfaceDesc(const GrSurfaceDesc&, GrMipMapped) const; /** - * Returns true if the GrBackendTexture can be used with the supplied SkColorType. If it is + * Returns true if the GrBackendTexutre can we used with the supplied SkColorType. If it is * compatible, the passed in GrPixelConfig will be set to a config that matches the backend * format and requested SkColorType. */ @@ -210,12 +209,6 @@ public: virtual bool validateBackendRenderTarget(const GrBackendRenderTarget&, SkColorType, GrPixelConfig*) const = 0; - // TODO: replace validateBackendTexture and validateBackendRenderTarget with calls to - // getConfigFromBackendFormat? - // TODO: it seems like we could pass the full SkImageInfo and validate its colorSpace too - virtual bool getConfigFromBackendFormat(const GrBackendFormat& format, SkColorType ct, - GrPixelConfig*) const = 0; - protected: /** Subclasses must call this at the end of their constructors in order to apply caps overrides requested by the client. Note that overrides will only reduce the caps never |