diff options
author | 2017-04-18 15:52:36 -0400 | |
---|---|---|
committer | 2017-04-18 20:33:58 +0000 | |
commit | 9440345a81d6c2372ac0aed937080f3da67439dd (patch) | |
tree | 6db32e47129a4469dff10d0f980d29a4d04b07ef /src/gpu/vk/GrVkImage.cpp | |
parent | 4d8adbccc46b53e44000c433dabade338eb35c6f (diff) |
Add backend safe classes for passing in external texture and render targets into gpu
This CL adds the GrBackend* classes as well as just updates the API for SkSurface and
SkImage. The implementation on SkSurface/Image and the plumbing down into Ganesh will
be in an additional CL.
Besides the change to use the type safe classes, we also pull the SurfaceFlags, origin,
samples, out of the descriptor and pass those in directly.
Bug: skia:
Change-Id: I9702981fe26c3d5d7d2cbcf6977ba569d356d854
Reviewed-on: https://skia-review.googlesource.com/13122
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkImage.cpp')
-rw-r--r-- | src/gpu/vk/GrVkImage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/vk/GrVkImage.cpp b/src/gpu/vk/GrVkImage.cpp index c3302a2b04..b3c103a9ca 100644 --- a/src/gpu/vk/GrVkImage.cpp +++ b/src/gpu/vk/GrVkImage.cpp @@ -20,7 +20,7 @@ VkImageAspectFlags vk_format_to_aspect_flags(VkFormat format) { case VK_FORMAT_D32_SFLOAT_S8_UINT: return VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT; default: - SkASSERT(GrVkFormatToPixelConfig(format, nullptr)); + SkASSERT(kUnknown_GrPixelConfig != GrVkFormatToPixelConfig(format)); return VK_IMAGE_ASPECT_COLOR_BIT; } } |