forked from rosa/hakurei
8366cdd224
Upstream does not appear to understand the point of tags, so include relevant unreleased changes here. Signed-off-by: Ophestra <cat@gensokyo.uk>
187 lines
6.5 KiB
Diff
187 lines
6.5 KiB
Diff
From c63848ecf2200425511319fd8bf2c17b751e501e Mon Sep 17 00:00:00 2001
|
|
From: apilatosba <104633944+apilatosba@users.noreply.github.com>
|
|
Date: Wed, 17 Jun 2026 17:38:53 +0200
|
|
Subject: [PATCH 18/26] added source language entry ApilaJai (#607)
|
|
|
|
---
|
|
include/spirv/spir-v.xml | 3 ++-
|
|
include/spirv/unified1/spirv.bf | 1 +
|
|
include/spirv/unified1/spirv.core.grammar.json | 5 +++++
|
|
include/spirv/unified1/spirv.cs | 1 +
|
|
include/spirv/unified1/spirv.h | 2 ++
|
|
include/spirv/unified1/spirv.hpp | 2 ++
|
|
include/spirv/unified1/spirv.hpp11 | 2 ++
|
|
include/spirv/unified1/spirv.json | 3 ++-
|
|
include/spirv/unified1/spirv.lua | 1 +
|
|
include/spirv/unified1/spirv.py | 1 +
|
|
include/spirv/unified1/spv.d | 1 +
|
|
11 files changed, 20 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/include/spirv/spir-v.xml b/include/spirv/spir-v.xml
|
|
index 1463dd6..1b083a4 100644
|
|
--- a/include/spirv/spir-v.xml
|
|
+++ b/include/spirv/spir-v.xml
|
|
@@ -83,7 +83,8 @@
|
|
<id value="48" vendor="Goopax" comment="Contact Ingo Josopait, josopait@goopax.com"/>
|
|
<id value="49" vendor="Icyllis Milica" tool="Arc3D Shader Compiler" comment="Contact Icyllis Milica, https://github.com/BloCamLimb/Arc3D"/>
|
|
<id value="50" vendor="Isochron" tool="Pred" comment="Contact Justin Ead, jebrim@isochrontechnologies.com"/>
|
|
- <unused start="51" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
|
|
+ <id value="51" vendor="apilatosba" tool="Apila Jai Compiler" comment="https://github.com/apilatosba/jai_to_spirv_compiler"/>
|
|
+ <unused start="52" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
|
|
</ids>
|
|
|
|
<!-- SECTION: SPIR-V Opcodes and Enumerants -->
|
|
diff --git a/include/spirv/unified1/spirv.bf b/include/spirv/unified1/spirv.bf
|
|
index fb9644e..40fbfff 100644
|
|
--- a/include/spirv/unified1/spirv.bf
|
|
+++ b/include/spirv/unified1/spirv.bf
|
|
@@ -57,6 +57,7 @@ namespace Spv
|
|
Zig = 12,
|
|
Rust = 13,
|
|
Pred = 14,
|
|
+ ApilaJai = 15,
|
|
Max = 0x7fffffff,
|
|
}
|
|
|
|
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
|
|
index 9e1adee..8b5595c 100644
|
|
--- a/include/spirv/unified1/spirv.core.grammar.json
|
|
+++ b/include/spirv/unified1/spirv.core.grammar.json
|
|
@@ -12689,6 +12689,11 @@
|
|
"enumerant" : "Pred",
|
|
"value" : 14,
|
|
"version" : "1.0"
|
|
+ },
|
|
+ {
|
|
+ "enumerant" : "ApilaJai",
|
|
+ "value" : 15,
|
|
+ "version" : "1.0"
|
|
}
|
|
]
|
|
},
|
|
diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs
|
|
index d0f69b9..a1b7d58 100644
|
|
--- a/include/spirv/unified1/spirv.cs
|
|
+++ b/include/spirv/unified1/spirv.cs
|
|
@@ -56,6 +56,7 @@ namespace Spv
|
|
Zig = 12,
|
|
Rust = 13,
|
|
Pred = 14,
|
|
+ ApilaJai = 15,
|
|
Max = 0x7fffffff,
|
|
}
|
|
|
|
diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
|
|
index 966ad68..d1f88cf 100644
|
|
--- a/include/spirv/unified1/spirv.h
|
|
+++ b/include/spirv/unified1/spirv.h
|
|
@@ -64,6 +64,7 @@ typedef enum SpvSourceLanguage_ {
|
|
SpvSourceLanguageZig = 12,
|
|
SpvSourceLanguageRust = 13,
|
|
SpvSourceLanguagePred = 14,
|
|
+ SpvSourceLanguageApilaJai = 15,
|
|
SpvSourceLanguageMax = 0x7fffffff,
|
|
} SpvSourceLanguage;
|
|
|
|
@@ -3566,6 +3567,7 @@ inline const char* SpvSourceLanguageToString(SpvSourceLanguage value) {
|
|
case SpvSourceLanguageZig: return "Zig";
|
|
case SpvSourceLanguageRust: return "Rust";
|
|
case SpvSourceLanguagePred: return "Pred";
|
|
+ case SpvSourceLanguageApilaJai: return "ApilaJai";
|
|
default: return "Unknown";
|
|
}
|
|
}
|
|
diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp
|
|
index 517b7cf..9f3cb01 100644
|
|
--- a/include/spirv/unified1/spirv.hpp
|
|
+++ b/include/spirv/unified1/spirv.hpp
|
|
@@ -60,6 +60,7 @@ enum SourceLanguage {
|
|
SourceLanguageZig = 12,
|
|
SourceLanguageRust = 13,
|
|
SourceLanguagePred = 14,
|
|
+ SourceLanguageApilaJai = 15,
|
|
SourceLanguageMax = 0x7fffffff,
|
|
};
|
|
|
|
@@ -3562,6 +3563,7 @@ inline const char* SourceLanguageToString(SourceLanguage value) {
|
|
case SourceLanguageZig: return "Zig";
|
|
case SourceLanguageRust: return "Rust";
|
|
case SourceLanguagePred: return "Pred";
|
|
+ case SourceLanguageApilaJai: return "ApilaJai";
|
|
default: return "Unknown";
|
|
}
|
|
}
|
|
diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11
|
|
index 4fa5f8f..4eb6fbd 100644
|
|
--- a/include/spirv/unified1/spirv.hpp11
|
|
+++ b/include/spirv/unified1/spirv.hpp11
|
|
@@ -60,6 +60,7 @@ enum class SourceLanguage : unsigned {
|
|
Zig = 12,
|
|
Rust = 13,
|
|
Pred = 14,
|
|
+ ApilaJai = 15,
|
|
Max = 0x7fffffff,
|
|
};
|
|
|
|
@@ -3562,6 +3563,7 @@ inline const char* SourceLanguageToString(SourceLanguage value) {
|
|
case SourceLanguage::Zig: return "Zig";
|
|
case SourceLanguage::Rust: return "Rust";
|
|
case SourceLanguage::Pred: return "Pred";
|
|
+ case SourceLanguage::ApilaJai: return "ApilaJai";
|
|
default: return "Unknown";
|
|
}
|
|
}
|
|
diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json
|
|
index 43a7891..1b124e4 100644
|
|
--- a/include/spirv/unified1/spirv.json
|
|
+++ b/include/spirv/unified1/spirv.json
|
|
@@ -66,7 +66,8 @@
|
|
"Slang": 11,
|
|
"Zig": 12,
|
|
"Rust": 13,
|
|
- "Pred": 14
|
|
+ "Pred": 14,
|
|
+ "ApilaJai": 15
|
|
}
|
|
},
|
|
{
|
|
diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua
|
|
index bb4c52f..a5f9267 100644
|
|
--- a/include/spirv/unified1/spirv.lua
|
|
+++ b/include/spirv/unified1/spirv.lua
|
|
@@ -51,6 +51,7 @@ spv = {
|
|
Zig = 12,
|
|
Rust = 13,
|
|
Pred = 14,
|
|
+ ApilaJai = 15,
|
|
Max = 0x7fffffff,
|
|
},
|
|
|
|
diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py
|
|
index e01e462..17cb6b1 100644
|
|
--- a/include/spirv/unified1/spirv.py
|
|
+++ b/include/spirv/unified1/spirv.py
|
|
@@ -51,6 +51,7 @@ spv = {
|
|
'Zig' : 12,
|
|
'Rust' : 13,
|
|
'Pred' : 14,
|
|
+ 'ApilaJai' : 15,
|
|
},
|
|
|
|
'ExecutionModel' : {
|
|
diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d
|
|
index 3e631ef..ceb9aac 100644
|
|
--- a/include/spirv/unified1/spv.d
|
|
+++ b/include/spirv/unified1/spv.d
|
|
@@ -59,6 +59,7 @@ enum SourceLanguage : uint
|
|
Zig = 12,
|
|
Rust = 13,
|
|
Pred = 14,
|
|
+ ApilaJai = 15,
|
|
Max = 0x7fffffff,
|
|
}
|
|
|
|
--
|
|
2.54.0
|
|
|