commit 25a508cc735109cc4e382c3a1cc293a9452a41f3
author John Kessenich <johnkslang@users.noreply.github.com> Fri Jul 12 18:29:59 2019 -0600
committer GitHub <noreply@github.com> Fri Jul 12 18:29:59 2019 -0600
tree f81da10ebd80a6acc61743613cfe0b7e98e034ba
parent 854439c6b909e066328d324b1d5a3a9058f20b2d
parent dbd4c3ce11a6f08eb6cb893602b5ed7f179a300a

Merge pull request #1835 from jmacnak-nv/jmacnak-sample-coverage-capability

spirv: Generate missing SampleMaskOverrideCoverageNV capability op

SPIRV/GlslangToSpv.cpp

diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 73a8f6a..fabaee9 100644
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -7738,6 +7738,7 @@
               decoration = (spv::Decoration)spv::DecorationMax;
         builder.addDecoration(id, decoration);
         if (decoration != spv::DecorationMax) {
+            builder.addCapability(spv::CapabilitySampleMaskOverrideCoverageNV);
             builder.addExtension(spv::E_SPV_NV_sample_mask_override_coverage);
         }
     }

SPIRV/disassemble.cpp

diff --git a/SPIRV/disassemble.cpp b/SPIRV/disassemble.cpp
index 3269f97..80ebac4 100644
--- a/SPIRV/disassemble.cpp
+++ b/SPIRV/disassemble.cpp
@@ -734,6 +734,7 @@
         case CapabilityFragmentBarycentricNV:       return "FragmentBarycentricNV";
         case CapabilityMeshShadingNV:               return "MeshShadingNV";
         case CapabilityImageFootprintNV:            return "ImageFootprintNV";
+        case CapabilitySampleMaskOverrideCoverageNV:return "SampleMaskOverrideCoverageNV";
 
         // NV Decorations
         case DecorationOverrideCoverageNV:          return "OverrideCoverageNV";

SPIRV/doc.cpp

diff --git a/SPIRV/doc.cpp b/SPIRV/doc.cpp
index 85a3a2e..ffa2af8 100644
--- a/SPIRV/doc.cpp
+++ b/SPIRV/doc.cpp
@@ -926,6 +926,7 @@
     case CapabilityMeshShadingNV:                   return "MeshShadingNV";
     case CapabilityImageFootprintNV:                return "ImageFootprintNV";
 //    case CapabilityShadingRateNV:                   return "ShadingRateNV";  // superseded by FragmentDensityEXT
+    case CapabilitySampleMaskOverrideCoverageNV:    return "SampleMaskOverrideCoverageNV";
 #endif
     case CapabilityFragmentDensityEXT:              return "FragmentDensityEXT";
 

Test/baseResults/spv.sampleMaskOverrideCoverage.frag.out

diff --git a/Test/baseResults/spv.sampleMaskOverrideCoverage.frag.out b/Test/baseResults/spv.sampleMaskOverrideCoverage.frag.out
index 84b763b..3a9872e 100644
--- a/Test/baseResults/spv.sampleMaskOverrideCoverage.frag.out
+++ b/Test/baseResults/spv.sampleMaskOverrideCoverage.frag.out
@@ -1,10 +1,10 @@
 spv.sampleMaskOverrideCoverage.frag
-Validation failed
 // Module Version 10000
 // Generated by (magic number): 80007
 // Id's are bound by 20
 
                               Capability Shader
+                              Capability SampleMaskOverrideCoverageNV
                               Extension  "SPV_NV_sample_mask_override_coverage"
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450