Skip to content

Commit 1e39f02

Browse files
authored
Merge pull request #4 from DominicMaas/slang-path/2026.3
Update Slang to 2026.3
2 parents 8e3b492 + 8de1af0 commit 1e39f02

File tree

13 files changed

+43
-6
lines changed

13 files changed

+43
-6
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Build & Release
2+
run-name: Building & Releasing ${{ inputs.version }}
23

34
on:
45
workflow_dispatch:

.github/workflows/test.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
name: Build & Test
22

33
on:
4-
push:
54
pull_request:
6-
branches: [ main ]
7-
paths:
8-
- '**.cs'
9-
- '**.csproj'
5+
6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.ref }}
8+
cancel-in-progress: true
109

1110
env:
1211
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1

.github/workflows/update_slang.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99

1010
jobs:
1111
createPullRequest:
12+
name: Create Pull Request
1213
runs-on: ubuntu-latest
1314
steps:
1415
- uses: actions/checkout@v6
@@ -23,8 +24,9 @@ jobs:
2324
uses: peter-evans/create-pull-request@v8
2425
with:
2526
commit-message: Update Slang
26-
branch: slang-path/${{ inputs.version }}
27+
branch: slang-update/${{ inputs.version }}
2728
title: "Update Slang to ${{ inputs.version }}"
2829
body: Auto Generated PR to update Slang to version ${{ inputs.version }}
30+
sign-commits: true
2931
assignees: DominicMaas
3032
reviewers: DominicMaas

SlangShaderSharp.slnx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<Folder Name="/Solution Items/">
88
<File Path=".github/workflows/release.yml" />
99
<File Path=".github/workflows/test.yml" />
10+
<File Path=".github/workflows/update_slang.yml" />
1011
<File Path="LICENSE.md" />
1112
<File Path="README.md" />
1213
<File Path="update_slang.ps1" />

headers/slang.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,13 @@ typedef uint32_t SlangSizeT;
911911
SLANG_EMIT_CPU_VIA_LLVM,
912912
};
913913

914+
enum SlangDiagnosticColor
915+
{
916+
SLANG_DIAGNOSTIC_COLOR_AUTO = 0, // Use color if output sink is a tty
917+
SLANG_DIAGNOSTIC_COLOR_ALWAYS, // Always use color
918+
SLANG_DIAGNOSTIC_COLOR_NEVER, // Never use color
919+
};
920+
914921
// All compiler option names supported by Slang.
915922
namespace slang
916923
{
@@ -1111,6 +1118,8 @@ typedef uint32_t SlangSizeT;
11111118
EnableMachineReadableDiagnostics, // bool, enable machine-readable diagnostic output
11121119
// (implies EnableRichDiagnostics)
11131120

1121+
DiagnosticColor, // intValue0: SlangDiagnosticColor (always, never, auto)
1122+
11141123
CountOf,
11151124
};
11161125

0 commit comments

Comments
 (0)