diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-11-15 20:48:56 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-15 20:49:03 +0000 |
| commit | 0fb6db4be6e30777cc5c87f1b601e8c4aacff2b1 (patch) | |
| tree | b1a506c856746e6f9b982c2c1f765057eeae59cd /src/gpu/mtl/GrMtlUtil.mm | |
| parent | 42d27c692ecbde284a484bc7e3940df852b55c1b (diff) | |
Revert "Add private grpixelconfigs for alpha_8 and alpha_half"
This reverts commit 33d17cbb003975fff895954435183756f9893c17.
Reason for revert: broke intel bots
Original change's description:
> Add private grpixelconfigs for alpha_8 and alpha_half
>
> Bug: skia:
> Change-Id: I5191b6e045aea2a5af2b305b5972ad1e638a7ace
> Reviewed-on: https://skia-review.googlesource.com/71763
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com
Change-Id: I6fff9241f7878f1ec7fad2663df9922c9cd8f628
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/72180
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/mtl/GrMtlUtil.mm')
| -rw-r--r-- | src/gpu/mtl/GrMtlUtil.mm | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/gpu/mtl/GrMtlUtil.mm b/src/gpu/mtl/GrMtlUtil.mm index 9e6c632638..24643669ea 100644 --- a/src/gpu/mtl/GrMtlUtil.mm +++ b/src/gpu/mtl/GrMtlUtil.mm @@ -7,8 +7,6 @@ #include "GrMtlUtil.h" -#include "GrTypesPriv.h" - bool GrPixelConfigToMTLFormat(GrPixelConfig config, MTLPixelFormat* format) { MTLPixelFormat dontCare; if (!format) { @@ -47,12 +45,9 @@ bool GrPixelConfigToMTLFormat(GrPixelConfig config, MTLPixelFormat* format) { #else return false; #endif - case kAlpha_8_GrPixelConfig: // fall through - case kAlpha_8_as_Red_GrPixelConfig: + case kAlpha_8_GrPixelConfig: *format = MTLPixelFormatR8Unorm; return true; - case kAlpha_8_as_Alpha_GrPixelConfig: - return false; case kGray_8_GrPixelConfig: *format = MTLPixelFormatR8Unorm; return true; @@ -65,12 +60,9 @@ bool GrPixelConfigToMTLFormat(GrPixelConfig config, MTLPixelFormat* format) { case kRGBA_half_GrPixelConfig: *format = MTLPixelFormatRGBA16Float; return true; - case kAlpha_half_GrPixelConfig: // fall through - case kAlpha_half_as_Red_GrPixelConfig: + case kAlpha_half_GrPixelConfig: *format = MTLPixelFormatR16Float; return true; - case kAlpha_half_as_Alpha_GrPixelConfig: - return false; } SK_ABORT("Unexpected config"); return false; |