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

Revert "fixed VK geometry shaders"

Browse Source 
This reverts commit eef1ed0b1f.

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>
This commit is contained in:
Ethan Nicholas 2019-01-22 19:02:58 +00:00 committed by Skia Commit-Bot
parent eef1ed0b1f
commit 483909c919
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -533,8 +533,9 @@ void GrVkCaps::initShaderCaps(const VkPhysicalDeviceProperties& properties,
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;

7
src/sksl/SkSLSPIRVCodeGenerator.cpp
View File

@ -2652,11 +2652,8 @@ SpvId SPIRVCodeGenerator::writeInterfaceBlock(const InterfaceBlock& intf) {
}
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();