diff options
| author |  Brian Osman <brianosman@google.com> | 2018-03-01 20:10:11 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-01 20:10:15 +0000 |
| commit | ded47a50143470d1acdafa03e878cc7da5608038 (patch) | |
| tree | 45eb5ca0de078bd3abe6f56a121d5d76abe6ae96 /src/gpu/mtl/GrMtlUtil.mm | |
| parent | caf1ebb95f7fea81d416b81beb4b46c25643c714 (diff) | |
Revert "Add 1010102 support to Ganesh"
This reverts commit 44b61204d9f5681b9474db017577d56f42a32d66.
Reason for revert: TSAN bot crashing
Original change's description:
> Add 1010102 support to Ganesh
>
> Adds gl1010102, gles1010102, vk1010102, and mtl1010102
> configs to DM.
>
> This uses the same saveLayer approach as CPU, switching
> to 8888 so that we have enough alpha precision.
>
> Change-Id: I9f5b63747ec01031c8db97dadfc42f77e4863ccb
> Reviewed-on: https://skia-review.googlesource.com/110500
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
TBR=mtklein@google.com,bsalomon@google.com,brianosman@google.com
Change-Id: I782e740763044c1ae78fb219161e37eec7617c74
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/111580
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/mtl/GrMtlUtil.mm')
| -rw-r--r-- | src/gpu/mtl/GrMtlUtil.mm | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gpu/mtl/GrMtlUtil.mm b/src/gpu/mtl/GrMtlUtil.mm index 383cc98264..a188afe4ad 100644 --- a/src/gpu/mtl/GrMtlUtil.mm +++ b/src/gpu/mtl/GrMtlUtil.mm @@ -30,12 +30,9 @@ bool GrPixelConfigToMTLFormat(GrPixelConfig config, MTLPixelFormat* format) { case kSBGRA_8888_GrPixelConfig: *format = MTLPixelFormatBGRA8Unorm_sRGB; return true; - case kRGBA_1010102_GrPixelConfig: - *format = MTLPixelFormatRGB10A2Unorm; - return true; case kRGB_565_GrPixelConfig: #ifdef SK_BUILD_FOR_IOS - *format = MTLPixelFormatB5G6R5Unorm; + *format = MTLPixelFormatR5G6B5Unorm; return true; #else return false; @@ -87,8 +84,6 @@ GrPixelConfig GrMTLFormatToPixelConfig(MTLPixelFormat format) { return kSRGBA_8888_GrPixelConfig; case MTLPixelFormatBGRA8Unorm_sRGB: return kSBGRA_8888_GrPixelConfig; - case MTLPixelFormatRGB10A2Unorm: - return kRGBA_1010102_GrPixelConfig; #ifdef SK_BUILD_FOR_IOS case MTLPixelFormatB5G6R5Unorm: return kRGB_565_GrPixelConfig; |