commit 483909c919cc4ab69ccd35bd2b11162d6013b95f
author Ethan Nicholas <ethannicholas@google.com> Tue Jan 22 19:02:58 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 22 19:03:01 2019 +0000
tree c949074f9d6daeebf7f6734a2abcba6fe5519d16
parent eef1ed0b1f6366c94c7a9697df6595dfc0476d7d

Revert "fixed VK geometry shaders"

This reverts commit eef1ed0b1f6366c94c7a9697df6595dfc0476d7d.

Reason for revert: breaking tree

Original change's description:
> fixed VK geometry shaders
> 
> Bug: skia:
> Change-Id: Ia26a99a6b85dba97e259525c4af0f4bdc464d804
> Reviewed-on: https://skia-review.googlesource.com/c/184561
> Reviewed-by: Chris Dalton <csmartdalton@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

TBR=csmartdalton@google.com,ethannicholas@google.com

Change-Id: I6d88cc56a582b4bb58e06621bfb8a892389ef46e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/c/185694
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/gpu/vk/GrVkCaps.cpp

diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp
index e0eb438..e115ea0 100644
--- a/src/gpu/vk/GrVkCaps.cpp
+++ b/src/gpu/vk/GrVkCaps.cpp
@@ -533,8 +533,9 @@
 
     shaderCaps->fShaderDerivativeSupport = true;
 
-    shaderCaps->fGeometryShaderSupport =
-            shaderCaps->fGSInvocationsSupport = features.features.geometryShader;
+    // FIXME: http://skbug.com/7733: Disable geometry shaders until Intel/Radeon GMs draw correctly.
+    // shaderCaps->fGeometryShaderSupport =
+    //         shaderCaps->fGSInvocationsSupport = features.features.geometryShader;
 
     shaderCaps->fDualSourceBlendingSupport = features.features.dualSrcBlend;
 

src/sksl/SkSLSPIRVCodeGenerator.cpp

diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
index 3946164..b5aa618 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -2652,11 +2652,8 @@
     }
     if (intf.fVariable.fModifiers.fFlags & Modifiers::kBuffer_Flag) {
         this->writeInstruction(SpvOpDecorate, typeId, SpvDecorationBufferBlock, fDecorationBuffer);
-    } else switch (intf.fVariable.fModifiers.fLayout.fBuiltin) {
-        case -1:
-        case SK_IN_BUILTIN:
-        case SK_OUT_BUILTIN:
-            this->writeInstruction(SpvOpDecorate, typeId, SpvDecorationBlock, fDecorationBuffer);
+    } else if (intf.fVariable.fModifiers.fLayout.fBuiltin == -1) {
+        this->writeInstruction(SpvOpDecorate, typeId, SpvDecorationBlock, fDecorationBuffer);
     }
     SpvStorageClass_ storageClass = get_storage_class(intf.fVariable.fModifiers);
     SpvId ptrType = this->nextId();