commit aa352de50c9ddd932b6b6576d9f856ec691d10a7
author Greg Daniel <egdaniel@google.com> Mon Jul 17 09:05:16 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jul 17 15:31:57 2017 +0000
tree 46436c6d6a7b3e4175d1e02f0a9a3174d4aa6cb6
parent 263cef7b5f4bb1c5eaddd81d3184566e6c121ec7

Update visibility checks in Vulkan to support geom shaders

Bug: skia:
Change-Id: Ie80bea38e644647e5a09e95053ddace30521361d
Reviewed-on: https://skia-review.googlesource.com/23300
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

src/gpu/vk/GrVkPipelineStateDataManager.cpp

diff --git a/src/gpu/vk/GrVkPipelineStateDataManager.cpp b/src/gpu/vk/GrVkPipelineStateDataManager.cpp
index 5d96bd7..ee0b6a7 100644
--- a/src/gpu/vk/GrVkPipelineStateDataManager.cpp
+++ b/src/gpu/vk/GrVkPipelineStateDataManager.cpp
@@ -33,8 +33,7 @@
             uniform.fType = uniformInfo.fVariable.getType();
         );
 
-        if (kVertex_GrShaderFlag == uniformInfo.fVisibility ||
-            kGeometry_GrShaderFlag == uniformInfo.fVisibility) {
+        if (!(kFragment_GrShaderFlag & uniformInfo.fVisibility)) {
             uniform.fBinding = GrVkUniformHandler::kGeometryBinding;
         } else {
             SkASSERT(kFragment_GrShaderFlag == uniformInfo.fVisibility);