diff options
author | 2017-11-02 16:56:09 +0000 | |
---|---|---|
committer | 2017-11-02 16:56:19 +0000 | |
commit | 6a40abc8c7e158e6be34c836f6ea1bbf7b498146 (patch) | |
tree | 6a74566b8ca660b65b2457ba42620a9e93331012 /src/gpu/vk/GrVkPipelineState.cpp | |
parent | 2b17f64694c4b919f8ea5dff5a81813f435fb410 (diff) |
Revert "Implement window rectangles in vulkan"
This reverts commit 94c0468b2b4255e3beed81efdcfbf6d9d39e11e4.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> Implement window rectangles in vulkan
>
> Bug: skia:
> Change-Id: I32c079b90a5503c797dfc073a093f940cd8c550a
> Reviewed-on: https://skia-review.googlesource.com/65423
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,csmartdalton@google.com
Change-Id: I5a90cb57fb5d4bcf8c7e76a5f71a7f16edbaf6be
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/67060
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkPipelineState.cpp')
-rw-r--r-- | src/gpu/vk/GrVkPipelineState.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/gpu/vk/GrVkPipelineState.cpp b/src/gpu/vk/GrVkPipelineState.cpp index 5256c6dbcd..17197750ab 100644 --- a/src/gpu/vk/GrVkPipelineState.cpp +++ b/src/gpu/vk/GrVkPipelineState.cpp @@ -571,9 +571,9 @@ bool GrVkPipelineState::Desc::Build(Desc* desc, const GrPipeline& pipeline, const GrStencilSettings& stencil, GrPrimitiveType primitiveType, - const GrCaps& caps) { + const GrShaderCaps& caps) { if (!INHERITED::Build(desc, primProc, primitiveType == GrPrimitiveType::kPoints, pipeline, - *caps.shaderCaps())) { + caps)) { return false; } @@ -587,12 +587,5 @@ bool GrVkPipelineState::Desc::Build(Desc* desc, b.add32((uint32_t)primitiveType); - if (GrCaps::WindowRectsSupport::kNone != caps.windowRectsSupport()) { - const GrWindowRectsState& windowState = pipeline.getWindowRectsState(); - uint32_t mode = (0u - (uint32_t)windowState.mode()); - SkASSERT(0u == mode || ~0u == mode); - b.add32((uint32_t)windowState.numWindows() ^ mode); - } - return true; } |