diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-11-16 17:59:22 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-16 17:59:33 +0000 |
| commit | 3b2f5b60ff9a82ade01746d7e7cbbcc9348d6c03 (patch) | |
| tree | 2231d093c5854d90efe4e7e2e74c8575e8c365fe /src/gpu/mtl | |
| parent | 7970765f7db5919ef5c6ad04b1a1bfe6505355c6 (diff) | |
Revert "Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half"""
This reverts commit b5fb7cf0163ccb939f90ecf53ef70732c01f23ae.
Reason for revert: breaking more devices
Original change's description:
> Revert "Revert "Add private grpixelconfigs for alpha_8 and alpha_half""
>
> This reverts commit 0fb6db4be6e30777cc5c87f1b601e8c4aacff2b1.
>
> Reason for revert: fixed bug
>
> Original change's description:
> > 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>
>
> TBR=egdaniel@google.com,bsalomon@google.com
>
> Change-Id: Ie028961ecbf5934c53cb859e019e548935b3af79
> Reviewed-on: https://skia-review.googlesource.com/72241
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com
Change-Id: Ieaac3eca2fc4919699c7de61a3c33348e92a7da0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/72660
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/mtl')
| -rw-r--r-- | src/gpu/mtl/GrMtlUtil.mm | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/gpu/mtl/GrMtlUtil.mm b/src/gpu/mtl/GrMtlUtil.mm index cc40e47c0b..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,8 +60,7 @@ 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; } |