diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-07-15 14:35:10 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-07-15 14:35:10 +0900 |
| commit | 8366cdd22448548116b4cc2f719fee73f8c30e91 (patch) | |
| tree | f60c5ab9ba35116cadbcd8af2ff1b25e45b2155f /internal/rosa/package/spirv/0013-Revert-Add-SPV_MESA_fragment_coverage_mask-enumerant.patch | |
| parent | 05f9939077ce5144a648ef537bbe79f294e2307c (diff) | |
internal/rosa/package/spirv: spirv-tools 2026.1 to 2026.2
Upstream does not appear to understand the point of tags, so include relevant unreleased changes here.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/package/spirv/0013-Revert-Add-SPV_MESA_fragment_coverage_mask-enumerant.patch')
| -rw-r--r-- | internal/rosa/package/spirv/0013-Revert-Add-SPV_MESA_fragment_coverage_mask-enumerant.patch | 282 |
1 files changed, 282 insertions, 0 deletions
diff --git a/internal/rosa/package/spirv/0013-Revert-Add-SPV_MESA_fragment_coverage_mask-enumerant.patch b/internal/rosa/package/spirv/0013-Revert-Add-SPV_MESA_fragment_coverage_mask-enumerant.patch new file mode 100644 index 00000000..52a11ed9 --- /dev/null +++ b/internal/rosa/package/spirv/0013-Revert-Add-SPV_MESA_fragment_coverage_mask-enumerant.patch @@ -0,0 +1,282 @@ +From 82dfca37143878c848d8df1f9e4d746f65e6827e Mon Sep 17 00:00:00 2001 +From: Faith Ekstrand <faith.ekstrand@collabora.com> +Date: Wed, 13 May 2026 12:00:42 -0400 +Subject: [PATCH 13/26] Revert "Add SPV_MESA_fragment_coverage_mask enumerants + (#580)" (#598) + +This reverts commit 157de8e260e9362225c0ce9a6675d034968abe15. +--- + include/spirv/unified1/spirv.bf | 2 -- + include/spirv/unified1/spirv.core.grammar.json | 13 ------------- + include/spirv/unified1/spirv.cs | 2 -- + include/spirv/unified1/spirv.h | 4 ---- + include/spirv/unified1/spirv.hpp | 4 ---- + include/spirv/unified1/spirv.hpp11 | 4 ---- + include/spirv/unified1/spirv.json | 2 -- + include/spirv/unified1/spirv.lua | 2 -- + include/spirv/unified1/spirv.py | 2 -- + include/spirv/unified1/spv.d | 2 -- + 10 files changed, 37 deletions(-) + +diff --git a/include/spirv/unified1/spirv.bf b/include/spirv/unified1/spirv.bf +index a512a3e..119ea89 100644 +--- a/include/spirv/unified1/spirv.bf ++++ b/include/spirv/unified1/spirv.bf +@@ -759,7 +759,6 @@ namespace Spv + SubgroupLocalInvocationId = 41, + VertexIndex = 42, + InstanceIndex = 43, +- FragmentCoverageMaskMESA = 4096, + CoreIDARM = 4160, + CoreCountARM = 4161, + CoreMaxIDARM = 4162, +@@ -1172,7 +1171,6 @@ namespace Spv + ShaderLayer = 69, + ShaderViewportIndex = 70, + UniformDecoration = 71, +- FragmentCoverageMESA = 4097, + CoreBuiltinsARM = 4165, + TileImageColorReadAccessEXT = 4166, + TileImageDepthReadAccessEXT = 4167, +diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json +index 32a350a..0f1b083 100644 +--- a/include/spirv/unified1/spirv.core.grammar.json ++++ b/include/spirv/unified1/spirv.core.grammar.json +@@ -16185,12 +16185,6 @@ + "capabilities" : [ "Shader" ], + "version": "1.0" + }, +- { +- "enumerant" : "FragmentCoverageMaskMESA", +- "value" : 4096, +- "capabilities" : [ "FragmentCoverageMESA" ], +- "version" : "None" +- }, + { + "enumerant" : "CoreIDARM", + "value" : 4160, +@@ -17330,13 +17324,6 @@ + "value" : 71, + "version" : "1.6" + }, +- { +- "enumerant" : "FragmentCoverageMESA", +- "value" : 4097, +- "capabilities" : [ "Shader" ], +- "extensions" : [ "SPV_MESA_fragment_coverage_mask" ], +- "version" : "None" +- }, + { + "enumerant" : "CoreBuiltinsARM", + "value" : 4165, +diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs +index 4d33ffa..7f66ede 100644 +--- a/include/spirv/unified1/spirv.cs ++++ b/include/spirv/unified1/spirv.cs +@@ -758,7 +758,6 @@ namespace Spv + SubgroupLocalInvocationId = 41, + VertexIndex = 42, + InstanceIndex = 43, +- FragmentCoverageMaskMESA = 4096, + CoreIDARM = 4160, + CoreCountARM = 4161, + CoreMaxIDARM = 4162, +@@ -1171,7 +1170,6 @@ namespace Spv + ShaderLayer = 69, + ShaderViewportIndex = 70, + UniformDecoration = 71, +- FragmentCoverageMESA = 4097, + CoreBuiltinsARM = 4165, + TileImageColorReadAccessEXT = 4166, + TileImageDepthReadAccessEXT = 4167, +diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h +index d9dedc0..99b983c 100644 +--- a/include/spirv/unified1/spirv.h ++++ b/include/spirv/unified1/spirv.h +@@ -745,7 +745,6 @@ typedef enum SpvBuiltIn_ { + SpvBuiltInSubgroupLocalInvocationId = 41, + SpvBuiltInVertexIndex = 42, + SpvBuiltInInstanceIndex = 43, +- SpvBuiltInFragmentCoverageMaskMESA = 4096, + SpvBuiltInCoreIDARM = 4160, + SpvBuiltInCoreCountARM = 4161, + SpvBuiltInCoreMaxIDARM = 4162, +@@ -1142,7 +1141,6 @@ typedef enum SpvCapability_ { + SpvCapabilityShaderLayer = 69, + SpvCapabilityShaderViewportIndex = 70, + SpvCapabilityUniformDecoration = 71, +- SpvCapabilityFragmentCoverageMESA = 4097, + SpvCapabilityCoreBuiltinsARM = 4165, + SpvCapabilityTileImageColorReadAccessEXT = 4166, + SpvCapabilityTileImageDepthReadAccessEXT = 4167, +@@ -4129,7 +4127,6 @@ inline const char* SpvBuiltInToString(SpvBuiltIn value) { + case SpvBuiltInSubgroupLocalInvocationId: return "SubgroupLocalInvocationId"; + case SpvBuiltInVertexIndex: return "VertexIndex"; + case SpvBuiltInInstanceIndex: return "InstanceIndex"; +- case SpvBuiltInFragmentCoverageMaskMESA: return "FragmentCoverageMaskMESA"; + case SpvBuiltInCoreIDARM: return "CoreIDARM"; + case SpvBuiltInCoreCountARM: return "CoreCountARM"; + case SpvBuiltInCoreMaxIDARM: return "CoreMaxIDARM"; +@@ -4328,7 +4325,6 @@ inline const char* SpvCapabilityToString(SpvCapability value) { + case SpvCapabilityShaderLayer: return "ShaderLayer"; + case SpvCapabilityShaderViewportIndex: return "ShaderViewportIndex"; + case SpvCapabilityUniformDecoration: return "UniformDecoration"; +- case SpvCapabilityFragmentCoverageMESA: return "FragmentCoverageMESA"; + case SpvCapabilityCoreBuiltinsARM: return "CoreBuiltinsARM"; + case SpvCapabilityTileImageColorReadAccessEXT: return "TileImageColorReadAccessEXT"; + case SpvCapabilityTileImageDepthReadAccessEXT: return "TileImageDepthReadAccessEXT"; +diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp +index d0a1606..966be25 100644 +--- a/include/spirv/unified1/spirv.hpp ++++ b/include/spirv/unified1/spirv.hpp +@@ -741,7 +741,6 @@ enum BuiltIn { + BuiltInSubgroupLocalInvocationId = 41, + BuiltInVertexIndex = 42, + BuiltInInstanceIndex = 43, +- BuiltInFragmentCoverageMaskMESA = 4096, + BuiltInCoreIDARM = 4160, + BuiltInCoreCountARM = 4161, + BuiltInCoreMaxIDARM = 4162, +@@ -1138,7 +1137,6 @@ enum Capability { + CapabilityShaderLayer = 69, + CapabilityShaderViewportIndex = 70, + CapabilityUniformDecoration = 71, +- CapabilityFragmentCoverageMESA = 4097, + CapabilityCoreBuiltinsARM = 4165, + CapabilityTileImageColorReadAccessEXT = 4166, + CapabilityTileImageDepthReadAccessEXT = 4167, +@@ -4125,7 +4123,6 @@ inline const char* BuiltInToString(BuiltIn value) { + case BuiltInSubgroupLocalInvocationId: return "SubgroupLocalInvocationId"; + case BuiltInVertexIndex: return "VertexIndex"; + case BuiltInInstanceIndex: return "InstanceIndex"; +- case BuiltInFragmentCoverageMaskMESA: return "FragmentCoverageMaskMESA"; + case BuiltInCoreIDARM: return "CoreIDARM"; + case BuiltInCoreCountARM: return "CoreCountARM"; + case BuiltInCoreMaxIDARM: return "CoreMaxIDARM"; +@@ -4324,7 +4321,6 @@ inline const char* CapabilityToString(Capability value) { + case CapabilityShaderLayer: return "ShaderLayer"; + case CapabilityShaderViewportIndex: return "ShaderViewportIndex"; + case CapabilityUniformDecoration: return "UniformDecoration"; +- case CapabilityFragmentCoverageMESA: return "FragmentCoverageMESA"; + case CapabilityCoreBuiltinsARM: return "CoreBuiltinsARM"; + case CapabilityTileImageColorReadAccessEXT: return "TileImageColorReadAccessEXT"; + case CapabilityTileImageDepthReadAccessEXT: return "TileImageDepthReadAccessEXT"; +diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11 +index fb5d724..bdc4ac0 100644 +--- a/include/spirv/unified1/spirv.hpp11 ++++ b/include/spirv/unified1/spirv.hpp11 +@@ -741,7 +741,6 @@ enum class BuiltIn : unsigned { + SubgroupLocalInvocationId = 41, + VertexIndex = 42, + InstanceIndex = 43, +- FragmentCoverageMaskMESA = 4096, + CoreIDARM = 4160, + CoreCountARM = 4161, + CoreMaxIDARM = 4162, +@@ -1138,7 +1137,6 @@ enum class Capability : unsigned { + ShaderLayer = 69, + ShaderViewportIndex = 70, + UniformDecoration = 71, +- FragmentCoverageMESA = 4097, + CoreBuiltinsARM = 4165, + TileImageColorReadAccessEXT = 4166, + TileImageDepthReadAccessEXT = 4167, +@@ -4125,7 +4123,6 @@ inline const char* BuiltInToString(BuiltIn value) { + case BuiltIn::SubgroupLocalInvocationId: return "SubgroupLocalInvocationId"; + case BuiltIn::VertexIndex: return "VertexIndex"; + case BuiltIn::InstanceIndex: return "InstanceIndex"; +- case BuiltIn::FragmentCoverageMaskMESA: return "FragmentCoverageMaskMESA"; + case BuiltIn::CoreIDARM: return "CoreIDARM"; + case BuiltIn::CoreCountARM: return "CoreCountARM"; + case BuiltIn::CoreMaxIDARM: return "CoreMaxIDARM"; +@@ -4324,7 +4321,6 @@ inline const char* CapabilityToString(Capability value) { + case Capability::ShaderLayer: return "ShaderLayer"; + case Capability::ShaderViewportIndex: return "ShaderViewportIndex"; + case Capability::UniformDecoration: return "UniformDecoration"; +- case Capability::FragmentCoverageMESA: return "FragmentCoverageMESA"; + case Capability::CoreBuiltinsARM: return "CoreBuiltinsARM"; + case Capability::TileImageColorReadAccessEXT: return "TileImageColorReadAccessEXT"; + case Capability::TileImageDepthReadAccessEXT: return "TileImageDepthReadAccessEXT"; +diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json +index af571b5..eb646f6 100644 +--- a/include/spirv/unified1/spirv.json ++++ b/include/spirv/unified1/spirv.json +@@ -767,7 +767,6 @@ + "SubgroupLocalInvocationId": 41, + "VertexIndex": 42, + "InstanceIndex": 43, +- "FragmentCoverageMaskMESA": 4096, + "CoreIDARM": 4160, + "CoreCountARM": 4161, + "CoreMaxIDARM": 4162, +@@ -1104,7 +1103,6 @@ + "ShaderLayer": 69, + "ShaderViewportIndex": 70, + "UniformDecoration": 71, +- "FragmentCoverageMESA": 4097, + "CoreBuiltinsARM": 4165, + "TileImageColorReadAccessEXT": 4166, + "TileImageDepthReadAccessEXT": 4167, +diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua +index f3da312..e425dd5 100644 +--- a/include/spirv/unified1/spirv.lua ++++ b/include/spirv/unified1/spirv.lua +@@ -732,7 +732,6 @@ spv = { + SubgroupLocalInvocationId = 41, + VertexIndex = 42, + InstanceIndex = 43, +- FragmentCoverageMaskMESA = 4096, + CoreIDARM = 4160, + CoreCountARM = 4161, + CoreMaxIDARM = 4162, +@@ -1129,7 +1128,6 @@ spv = { + ShaderLayer = 69, + ShaderViewportIndex = 70, + UniformDecoration = 71, +- FragmentCoverageMESA = 4097, + CoreBuiltinsARM = 4165, + TileImageColorReadAccessEXT = 4166, + TileImageDepthReadAccessEXT = 4167, +diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py +index 88e5cbc..a35941b 100644 +--- a/include/spirv/unified1/spirv.py ++++ b/include/spirv/unified1/spirv.py +@@ -713,7 +713,6 @@ spv = { + 'SubgroupLocalInvocationId' : 41, + 'VertexIndex' : 42, + 'InstanceIndex' : 43, +- 'FragmentCoverageMaskMESA' : 4096, + 'CoreIDARM' : 4160, + 'CoreCountARM' : 4161, + 'CoreMaxIDARM' : 4162, +@@ -1100,7 +1099,6 @@ spv = { + 'ShaderLayer' : 69, + 'ShaderViewportIndex' : 70, + 'UniformDecoration' : 71, +- 'FragmentCoverageMESA' : 4097, + 'CoreBuiltinsARM' : 4165, + 'TileImageColorReadAccessEXT' : 4166, + 'TileImageDepthReadAccessEXT' : 4167, +diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d +index aab392c..8fa24b9 100644 +--- a/include/spirv/unified1/spv.d ++++ b/include/spirv/unified1/spv.d +@@ -761,7 +761,6 @@ enum BuiltIn : uint + SubgroupLocalInvocationId = 41, + VertexIndex = 42, + InstanceIndex = 43, +- FragmentCoverageMaskMESA = 4096, + CoreIDARM = 4160, + CoreCountARM = 4161, + CoreMaxIDARM = 4162, +@@ -1174,7 +1173,6 @@ enum Capability : uint + ShaderLayer = 69, + ShaderViewportIndex = 70, + UniformDecoration = 71, +- FragmentCoverageMESA = 4097, + CoreBuiltinsARM = 4165, + TileImageColorReadAccessEXT = 4166, + TileImageDepthReadAccessEXT = 4167, +-- +2.54.0 + |
