commit 40599feeed92e8854e1e4224d75f254c797e6174
author Chris Dalton <csmartdalton@google.com> Mon Sep 24 20:27:18 2018 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 25 14:34:57 2018 +0000
tree 7bfe30d71ac39bf71a7ed225a0dea079a99d4bee
parent dedf8f238afca7dca809b5a3e0f23ce0f0e52fe2

Enable CCPR on Vulkan without geometry shaders

Removes the CCPR blacklist for Vulkan, and disables geometry shaders
on Vulkan while we continue to investigate http://skbug.com/7733.

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

src/gpu/vk/GrVkCaps.cpp

diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp
index 2de784f..a1388a6 100644
--- a/src/gpu/vk/GrVkCaps.cpp
+++ b/src/gpu/vk/GrVkCaps.cpp
@@ -32,7 +32,6 @@
     fOversizedStencilSupport = false; //TODO: figure this out
     fInstanceAttribSupport = true;
 
-    fBlacklistCoverageCounting = true; // blacklisting ccpr until we work through a few issues.
     fFenceSyncSupport = true;   // always available in Vulkan
     fCrossContextTextureSupport = true;
     fHalfFloatVertexAttributeSupport = true;
@@ -498,8 +497,9 @@
 
     shaderCaps->fShaderDerivativeSupport = true;
 
-    shaderCaps->fGeometryShaderSupport = features.features.geometryShader;
-    shaderCaps->fGSInvocationsSupport = shaderCaps->fGeometryShaderSupport;
+    // 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;