diff options
author | 2016-11-10 11:19:51 -0500 | |
---|---|---|
committer | 2016-11-10 17:13:34 +0000 | |
commit | 434c534bd0ec08cb355fecfb6d2110197b523e74 (patch) | |
tree | 119167b88683157346ab8250bbc553903e046f7f /src/gpu/vk/GrVkUtil.cpp | |
parent | e13a69baac9dc326510009fa7c0c5966aee9240c (diff) |
Add integer texture support.
This allows us to create integer textures and sample them from a GrProcessor's code.
Filtering is limited to NEAREST.
Adds tests for reading/writing pixels, copying, and drawing. These operations are not allowed to convert to fixed/float configs.
Vulkan support is TBD.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4348
Change-Id: If38d89a03285d4bd98d1f14f9638b0320977e43d
Reviewed-on: https://skia-review.googlesource.com/4348
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkUtil.cpp')
-rw-r--r-- | src/gpu/vk/GrVkUtil.cpp | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/src/gpu/vk/GrVkUtil.cpp b/src/gpu/vk/GrVkUtil.cpp index a14f827dcb..1d93e8d4e5 100644 --- a/src/gpu/vk/GrVkUtil.cpp +++ b/src/gpu/vk/GrVkUtil.cpp @@ -19,58 +19,62 @@ bool GrPixelConfigToVkFormat(GrPixelConfig config, VkFormat* format) { } switch (config) { + case kUnknown_GrPixelConfig: + return false; case kRGBA_8888_GrPixelConfig: *format = VK_FORMAT_R8G8B8A8_UNORM; - break; + return true; case kBGRA_8888_GrPixelConfig: *format = VK_FORMAT_B8G8R8A8_UNORM; - break; + return true; case kSRGBA_8888_GrPixelConfig: *format = VK_FORMAT_R8G8B8A8_SRGB; - break; + return true; case kSBGRA_8888_GrPixelConfig: *format = VK_FORMAT_B8G8R8A8_SRGB; - break; + return true; + case kRGBA_8888_sint_GrPixelConfig: + *format = VK_FORMAT_R8G8B8A8_SINT; + return true; case kRGB_565_GrPixelConfig: *format = VK_FORMAT_R5G6B5_UNORM_PACK16; - break; + return true; case kRGBA_4444_GrPixelConfig: // R4G4B4A4 is not required to be supported so we actually // store the data is if it was B4G4R4A4 and swizzle in shaders *format = VK_FORMAT_B4G4R4A4_UNORM_PACK16; - break; + return true; case kIndex_8_GrPixelConfig: // No current vulkan support for this config return false; case kAlpha_8_GrPixelConfig: *format = VK_FORMAT_R8_UNORM; - break; + return true; case kETC1_GrPixelConfig: // converting to ETC2 which is a superset of ETC1 *format = VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK; - break; + return true; case kLATC_GrPixelConfig: // No current vulkan support for this config return false; case kR11_EAC_GrPixelConfig: *format = VK_FORMAT_EAC_R11_UNORM_BLOCK; - break; + return true; case kASTC_12x12_GrPixelConfig: *format = VK_FORMAT_ASTC_12x12_UNORM_BLOCK; - break; + return true; case kRGBA_float_GrPixelConfig: *format = VK_FORMAT_R32G32B32A32_SFLOAT; - break; + return true; case kRGBA_half_GrPixelConfig: *format = VK_FORMAT_R16G16B16A16_SFLOAT; - break; + return true; case kAlpha_half_GrPixelConfig: *format = VK_FORMAT_R16_SFLOAT; - break; - default: - return false; + return true; } - return true; + SkFAIL("Unexpected config"); + return false; } bool GrVkFormatToPixelConfig(VkFormat format, GrPixelConfig* config) { @@ -92,6 +96,9 @@ bool GrVkFormatToPixelConfig(VkFormat format, GrPixelConfig* config) { case VK_FORMAT_B8G8R8A8_SRGB: *config = kSBGRA_8888_GrPixelConfig; break; + case VK_FORMAT_R8G8B8A8_SINT: + *config = kRGBA_8888_sint_GrPixelConfig; + break; case VK_FORMAT_R5G6B5_UNORM_PACK16: *config = kRGB_565_GrPixelConfig; break; |