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/vk/GrVkCaps.cpp | |
| 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/vk/GrVkCaps.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkCaps.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp index 6804aeb22f..2b24205af8 100644 --- a/src/gpu/vk/GrVkCaps.cpp +++ b/src/gpu/vk/GrVkCaps.cpp @@ -208,10 +208,7 @@ void GrVkCaps::initShaderCaps(const VkPhysicalDeviceProperties& properties, uint // fConfigOutputSwizzle will default to RGBA so we only need to set it for alpha only config. for (int i = 0; i < kGrPixelConfigCnt; ++i) { GrPixelConfig config = static_cast<GrPixelConfig>(i); - // Vulkan doesn't support a single channel format stored in alpha. - if (GrPixelConfigIsAlphaOnly(config) && - kAlpha_8_as_Alpha_GrPixelConfig != config && - kAlpha_half_as_Alpha_GrPixelConfig != config) { + if (GrPixelConfigIsAlphaOnly(config)) { shaderCaps->fConfigTextureSwizzle[i] = GrSwizzle::RRRR(); shaderCaps->fConfigOutputSwizzle[i] = GrSwizzle::AAAA(); } else { |