AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable CCPR on Vulkan without geometry shaders

Browse Source 
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>
This commit is contained in:
Chris Dalton 2018-09-24 20:27:18 -06:00 committed by Skia Commit-Bot
parent dedf8f238a
commit 40599feeed
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json
View File

@ -167,6 +167,7 @@
"~top25desk_ebay_com.skp_1.1",
"~top25desk_ebay.skp_1.1",
"~top25desk_ebay.skp_1.1_mpd",
"~svgparse_Vermont_state_seal.svg_1",
"~inc0.gif",
"~inc1.gif",
"~incInterlaced.gif",

2
infra/bots/recipes/perf.py
View File

@ -205,6 +205,8 @@ def nanobench_flags(api, bot):
match.append('~top25desk_ebay_com.skp_1.1')
match.append('~top25desk_ebay.skp_1.1')
match.append('~top25desk_ebay.skp_1.1_mpd')
# skia:8408
match.append('~svgparse_Vermont_state_seal.svg_1')
if ('ASAN' in bot or 'UBSAN' in bot) and 'CPU' in bot:
# floor2int_undef benches undefined behavior, so ASAN correctly complains.
match.append('~^floor2int_undef$')

6
src/gpu/vk/GrVkCaps.cpp
View File

@ -32,7 +32,6 @@ GrVkCaps::GrVkCaps(const GrContextOptions& contextOptions, const GrVkInterface*
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 @@ void GrVkCaps::initShaderCaps(const VkPhysicalDeviceProperties& properties,
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;