diff options
author | Cary Clark <caryclark@google.com> | 2018-02-13 17:02:19 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-13 17:02:31 +0000 |
commit | 559823d1fee3a9e26170d0ac1f3aaa87b3a3c66a (patch) | |
tree | 74a3eded6110558487836262490e3eb027534e3c /include/gpu/GrBackendSurface.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/GrBackendSurface.h')
-rw-r--r-- | include/gpu/GrBackendSurface.h | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/include/gpu/GrBackendSurface.h b/include/gpu/GrBackendSurface.h index d28ef8af98..ffe422d0a7 100644 --- a/include/gpu/GrBackendSurface.h +++ b/include/gpu/GrBackendSurface.h @@ -16,69 +16,6 @@ #include "vk/GrVkTypes.h" #endif -class SK_API GrBackendFormat { -public: - // Creates an invalid backend format. - GrBackendFormat() : fValid(false) {} - - static GrBackendFormat MakeGL(GrGLenum format, GrGLenum target) { - return GrBackendFormat(format, target); - } - -#ifdef SK_VULKAN - static GrBackendFormat MakeVK(VkFormat format) { - return GrBackendFormat(format); - } -#endif - - static GrBackendFormat MakeMock(GrPixelConfig config) { - return GrBackendFormat(config); - } - - GrBackend backend() const {return fBackend; } - - // If the backend API is GL, these return a pointer to the format and target. Otherwise - // it returns nullptr. - const GrGLenum* getGLFormat() const; - const GrGLenum* getGLTarget() const; - -#ifdef SK_VULKAN - // If the backend API is Vulkan, this returns a pointer to a VkFormat. Otherwise - // it returns nullptr - const VkFormat* getVkFormat() const; -#endif - - // If the backend API is Mock, this returns a pointer to a GrPixelConfig. Otherwise - // it returns nullptr. - const GrPixelConfig* getMockFormat() const; - - // Returns true if the backend format has been initialized. - bool isValid() const { return fValid; } - -private: - GrBackendFormat(GrGLenum format, GrGLenum target); - -#ifdef SK_VULKAN - GrBackendFormat(const VkFormat vkFormat); -#endif - - GrBackendFormat(const GrPixelConfig config); - - GrBackend fBackend; - bool fValid; - - union { - struct { - GrGLenum fGLTarget; // GL_TEXTURE_2D, GL_TEXTURE_EXTERNAL or GL_TEXTURE_RECTANGLE - GrGLenum fGLFormat; // the sized, internal format of the GL resource - }; -#ifdef SK_VULKAN - VkFormat fVkFormat; -#endif - GrPixelConfig fMockFormat; - }; -}; - class SK_API GrBackendTexture { public: // Creates an invalid backend texture. |