diff options
| author |  egdaniel <egdaniel@google.com> | 2016-08-11 13:44:23 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-11 13:44:23 -0700 |
| commit | 637b3bf2b9c10398d823bd015a722842d4f2f971 (patch) | |
| tree | c155de4d14370817ca285dd0edec4b4a567a1eca /src/gpu | |
| parent | bcba19dd0232f9ec75dae8f5987e0d15bbf93c41 (diff) | |
Fix 4444 on Vulkan devices who don't support RGBA_4444
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2238563002
Review-Url: https://codereview.chromium.org/2238563002
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/vk/GrVkCaps.cpp | 11 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkCaps.h | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkUtil.cpp | 8 |
3 files changed, 17 insertions, 4 deletions
diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp index cf9f4f025e..9027f68815 100644 --- a/src/gpu/vk/GrVkCaps.cpp +++ b/src/gpu/vk/GrVkCaps.cpp @@ -137,7 +137,16 @@ void GrVkCaps::initGLSLCaps(const VkPhysicalDeviceProperties& properties, glslCaps->fConfigTextureSwizzle[i] = GrSwizzle::RRRR(); glslCaps->fConfigOutputSwizzle[i] = GrSwizzle::AAAA(); } else { - glslCaps->fConfigTextureSwizzle[i] = GrSwizzle::RGBA(); + if (kRGBA_4444_GrPixelConfig == config) { + // The vulkan spec does not require R4G4B4A4 to be supported for texturing so we + // store the data in a B4G4R4A4 texture and then swizzle it when doing texture reads + // or writing to outputs. Since we're not actually changing the data at all, the + // only extra work is the swizzle in the shader for all operations. + glslCaps->fConfigTextureSwizzle[i] = GrSwizzle::BGRA(); + glslCaps->fConfigOutputSwizzle[i] = GrSwizzle::BGRA(); + } else { + glslCaps->fConfigTextureSwizzle[i] = GrSwizzle::RGBA(); + } } } diff --git a/src/gpu/vk/GrVkCaps.h b/src/gpu/vk/GrVkCaps.h index 576972110d..3a35b64e4e 100644 --- a/src/gpu/vk/GrVkCaps.h +++ b/src/gpu/vk/GrVkCaps.h @@ -101,7 +101,7 @@ private: uint16_t fLinearFlags; }; ConfigInfo fConfigTable[kGrPixelConfigCnt]; - + StencilFormat fPreferedStencilFormat; // Tells of if we can pass in straight GLSL string into vkCreateShaderModule diff --git a/src/gpu/vk/GrVkUtil.cpp b/src/gpu/vk/GrVkUtil.cpp index 760b20b458..ffbad25fd9 100644 --- a/src/gpu/vk/GrVkUtil.cpp +++ b/src/gpu/vk/GrVkUtil.cpp @@ -30,7 +30,9 @@ bool GrPixelConfigToVkFormat(GrPixelConfig config, VkFormat* format) { *format = VK_FORMAT_R5G6B5_UNORM_PACK16; break; case kRGBA_4444_GrPixelConfig: - *format = VK_FORMAT_R4G4B4A4_UNORM_PACK16; + // 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; case kIndex_8_GrPixelConfig: // No current vulkan support for this config @@ -88,7 +90,9 @@ bool GrVkFormatToPixelConfig(VkFormat format, GrPixelConfig* config) { case VK_FORMAT_R5G6B5_UNORM_PACK16: *config = kRGB_565_GrPixelConfig; break; - case VK_FORMAT_R4G4B4A4_UNORM_PACK16: + case VK_FORMAT_B4G4R4A4_UNORM_PACK16: + // R4G4B4A4 is not required to be supported so we actually + // store RGBA_4444 data as B4G4R4A4. *config = kRGBA_4444_GrPixelConfig; break; case VK_FORMAT_R8_UNORM: |