Skip to content

Commit f4041e7

Browse files
committed
Add Metal developer tools 4.1 and shader converter 1.1
1 parent aaaf829 commit f4041e7

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 2024-03-03
4+
5+
* Added Metal compiler 4.1
6+
* Added Metal shader converter 1.1
7+
38
## 2024-03-02
49

510
* Updated Tint compiler (#114)

src/ShaderPlayground.Core/CommonParameters.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ public static ShaderCompilerParameter CreateVersionParameter(string binaryFolder
7272
x = x.TrimStart('v');
7373
y = y.TrimStart('v');
7474

75+
x = x == "beta" ? "1.0-beta" : x;
76+
y = y == "beta" ? "1.0-beta" : y;
77+
7578
if (SemanticVersion.TryParse(x, out var semanticX))
7679
{
7780
if (SemanticVersion.TryParse(y, out var semanticY))

src/ShaderPlayground.Core/Compilers/Metal/MetalCompiler.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal sealed class MetalCompiler : IShaderCompiler
1717
public ShaderCompilerParameter[] Parameters { get; } =
1818
{
1919
CommonParameters.CreateVersionParameter("metal"),
20-
new ShaderCompilerParameter("MetalVersion", "Metal Language Version", ShaderCompilerParameterType.ComboBox, MetalVersions, "metal3.0"),
20+
new ShaderCompilerParameter("MetalVersion", "Metal Language Version", ShaderCompilerParameterType.ComboBox, MetalVersions, "metal3.1"),
2121
CommonParameters.CreateOutputParameter(new[] { LanguageNames.MetalIR }),
2222
};
2323

@@ -40,6 +40,7 @@ internal sealed class MetalCompiler : IShaderCompiler
4040
"ios-metal2.3",
4141
"ios-metal2.4",
4242
"metal3.0",
43+
"metal3.1",
4344
};
4445

4546
public ShaderCompilerResult Compile(ShaderCode shaderCode, ShaderCompilerArguments arguments, List<ShaderCompilerArguments> previousCompilerArguments)

0 commit comments

Comments
 (0)