Skip to content
This repository was archived by the owner on Dec 17, 2025. It is now read-only.

Commit fe52302

Browse files
committed
Version 1.13.0 [release 1.13.0]
1 parent f39444e commit fe52302

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Setup Xcode version
4242
uses: maxim-lobanov/setup-xcode@v1
4343
with:
44-
xcode-version: '15.0'
44+
xcode-version: '16.4'
4545
- name: build
4646
shell: pwsh
4747
run: |
@@ -61,7 +61,7 @@ jobs:
6161
- name: Setup Xcode version
6262
uses: maxim-lobanov/setup-xcode@v1
6363
with:
64-
xcode-version: '15.0'
64+
xcode-version: '15.2'
6565
- name: build
6666
shell: pwsh
6767
run: |

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ It uses [glslang](https://github.com/KhronosGroup/glslang) for parsing GLSL and
99

1010
## ChangeLog
1111

12+
### 1.13.0
13+
14+
- Target MSL default version to 2.0 (requires macos13 or ios11)
15+
1216
### 1.12.0
1317

1418
- Fix msl vertex location overlaps when contains mat4

src/axslcc.cpp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
// Add option --msl_ios for target iOS MSL
6464
// Add option --fixup_clipspace
6565
// Add option --msl_reset_vlocs
66+
// 1.13.0 Target MSL default version to 2.0
6667

6768
/**
6869
* @since 1.9.5
@@ -116,7 +117,7 @@
116117
#include "../3rdparty/sjson/sjson.h"
117118

118119
#define VERSION_MAJOR 1
119-
#define VERSION_MINOR 12
120+
#define VERSION_MINOR 13
120121
#define VERSION_SUB 0
121122

122123
using namespace axslc;
@@ -1336,6 +1337,7 @@ static int cross_compile(const cmd_args& args, std::vector<uint32_t>& spirv,
13361337
spirv_cross::CompilerMSL::Options msl_opts = msl->get_msl_options();
13371338
msl_opts.enable_decoration_binding = true;
13381339
// msl_opts.enable_base_index_zero = true;
1340+
msl_opts.msl_version = args.profile_ver;
13391341
msl_opts.ios_support_base_vertex_instance = true; // ios-9.0+
13401342
msl_opts.platform = args.msl_ios ? spirv_cross::CompilerMSL::Options::Platform::iOS : spirv_cross::CompilerMSL::Options::Platform::macOS;
13411343
msl->set_msl_options(msl_opts);
@@ -2042,14 +2044,18 @@ int main(int argc, char* argv[])
20422044

20432045
// Set default shader profile version
20442046
// HLSL: 50 (5.0)
2045-
// GLSL: 200 (2.00)
2047+
// GLSL: 330 (3.3)
2048+
// ESSL: 300 (3.0)
2049+
// MSL: 20000 (2.0)
20462050
if (args.profile_ver == 0) {
20472051
if (args.lang == SHADER_LANG_ESSL)
2048-
args.profile_ver = 200;
2052+
args.profile_ver = 300;
20492053
else if (args.lang == SHADER_LANG_HLSL)
20502054
args.profile_ver = 50; // D3D11
20512055
else if (args.lang == SHADER_LANG_GLSL)
20522056
args.profile_ver = 330;
2057+
else if (args.lang == SHADER_LANG_MSL)
2058+
args.profile_ver = spirv_cross::CompilerMSL::Options::make_msl_version(2, 0);
20532059
}
20542060

20552061
#if SX_PLATFORM_WINDOWS

0 commit comments

Comments
 (0)