Skip to content

Commit 16f5753

Browse files
committed
Update openal-soft submodule
1 parent 48d182f commit 16f5753

File tree

11 files changed

+100
-69
lines changed

11 files changed

+100
-69
lines changed

.silktouch/72b687a9cceac28c.stout

-8 Bytes
Binary file not shown.

eng/submodules/openal-soft

Submodule openal-soft updated 148 files
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// Generated using the OpenAL Soft headers and corresponding dependencies.
4+
// Original source is licensed under the LGPL 2.0 license. Please note that while bindings are able to be MIT due to
5+
// being header-derived only, implementations of the headers may have a less permissive license.
6+
using System;
7+
using System.Diagnostics;
8+
using System.Runtime.CompilerServices;
9+
using System.Runtime.InteropServices;
10+
11+
namespace Silk.NET.OpenAL;
12+
13+
[NativeName("ContextErrorCode")]
14+
public enum ContextErrorCode : uint
15+
{
16+
[NativeName("ALC_NO_ERROR")]
17+
NoError = 0,
18+
19+
[NativeName("ALC_INVALID_DEVICE")]
20+
InvalidDevice = 40961,
21+
22+
[NativeName("ALC_INVALID_CONTEXT")]
23+
InvalidContext = 40962,
24+
25+
[NativeName("ALC_INVALID_ENUM")]
26+
InvalidEnum = 40963,
27+
28+
[NativeName("ALC_INVALID_VALUE")]
29+
InvalidValue = 40964,
30+
31+
[NativeName("ALC_OUT_OF_MEMORY")]
32+
OutOfMemory = 40965,
33+
}

sources/OpenAL/OpenAL/Enums/ErrorCode.gen.cs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,4 @@ public enum ErrorCode : uint
3636

3737
[NativeName("AL_STACK_UNDERFLOW_EXT")]
3838
StackUnderflowEXT = 6606,
39-
40-
[NativeName("ALC_NO_ERROR")]
41-
CNoError = 0,
42-
43-
[NativeName("ALC_INVALID_DEVICE")]
44-
CInvalidDevice = 40961,
45-
46-
[NativeName("ALC_INVALID_CONTEXT")]
47-
CInvalidContext = 40962,
48-
49-
[NativeName("ALC_INVALID_ENUM")]
50-
CInvalidEnum = 40963,
51-
52-
[NativeName("ALC_INVALID_VALUE")]
53-
CInvalidValue = 40964,
54-
55-
[NativeName("ALC_OUT_OF_MEMORY")]
56-
COutOfMemory = 40965,
5739
}

sources/OpenAL/OpenAL/Enums/EventTypeSOFT.gen.cs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,11 @@ namespace Silk.NET.OpenAL;
1414
public enum EventTypeSOFT : uint
1515
{
1616
[NativeName("AL_EVENT_TYPE_BUFFER_COMPLETED_SOFT")]
17-
EventTypeBufferCompleted = 6564,
17+
BufferCompleted = 6564,
1818

1919
[NativeName("AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT")]
20-
EventTypeSourceStateChanged = 6565,
20+
SourceStateChanged = 6565,
2121

2222
[NativeName("AL_EVENT_TYPE_DISCONNECTED_SOFT")]
23-
EventTypeDisconnected = 6566,
24-
25-
[NativeName("ALC_EVENT_TYPE_DEFAULT_DEVICE_CHANGED_SOFT")]
26-
CEventTypeDefaultDeviceChanged = 6614,
27-
28-
[NativeName("ALC_EVENT_TYPE_DEVICE_ADDED_SOFT")]
29-
CEventTypeDeviceAdded = 6615,
30-
31-
[NativeName("ALC_EVENT_TYPE_DEVICE_REMOVED_SOFT")]
32-
CEventTypeDeviceRemoved = 6616,
23+
Disconnected = 6566,
3324
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// Generated using the OpenAL Soft headers and corresponding dependencies.
4+
// Original source is licensed under the LGPL 2.0 license. Please note that while bindings are able to be MIT due to
5+
// being header-derived only, implementations of the headers may have a less permissive license.
6+
using System;
7+
using System.Diagnostics;
8+
using System.Runtime.CompilerServices;
9+
using System.Runtime.InteropServices;
10+
11+
namespace Silk.NET.OpenAL;
12+
13+
[NativeName("SystemEventTypeSOFT")]
14+
public enum SystemEventTypeSOFT : uint
15+
{
16+
[NativeName("ALC_EVENT_TYPE_DEFAULT_DEVICE_CHANGED_SOFT")]
17+
DefaultDeviceChanged = 6614,
18+
19+
[NativeName("ALC_EVENT_TYPE_DEVICE_ADDED_SOFT")]
20+
DeviceAdded = 6615,
21+
22+
[NativeName("ALC_EVENT_TYPE_DEVICE_REMOVED_SOFT")]
23+
DeviceRemoved = 6616,
24+
}

sources/OpenAL/OpenAL/Extensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public partial class ALContext
2121
public static void ThrowError(DeviceHandle device)
2222
{
2323
var err = GetError(device);
24-
if (err != ErrorCode.NoError)
24+
if (err != ContextErrorCode.NoError)
2525
{
2626
static void Throw(ErrorCode err) => throw new OpenALException(err);
27-
Throw(err);
27+
Throw((ErrorCode)(int)err);
2828
}
2929
}
3030
}
@@ -44,10 +44,10 @@ public static void ThrowError(this IAL al)
4444
public static void ThrowError(this IALContext alc, DeviceHandle device)
4545
{
4646
var err = alc.GetError(device);
47-
if (err != ErrorCode.NoError)
47+
if (err != ContextErrorCode.NoError)
4848
{
4949
static void Throw(ErrorCode err) => throw new OpenALException(err);
50-
Throw(err);
50+
Throw((ErrorCode)(int)err);
5151
}
5252
}
5353
}

sources/OpenAL/OpenAL/al/AL.gen.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4106,17 +4106,17 @@ public static int GetEnumValueDirect(ContextHandle context, Ref<sbyte> ename)
41064106
[NativeName("alGetError")]
41074107
[SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
41084108
[NativeFunction("openal", EntryPoint = "alGetError")]
4109-
public static Constant<int, ErrorCode> GetError() =>
4110-
(Constant<int, ErrorCode>)(int)GetErrorRaw();
4109+
public static Constant<int, ALEnum, ErrorCode> GetError() =>
4110+
(Constant<int, ALEnum, ErrorCode>)(int)GetErrorRaw();
41114111

41124112
[NativeName("alGetErrorDirect")]
41134113
[
41144114
SupportedApiProfile("al", ["AL_EXT_direct_context"]),
41154115
SupportedApiProfile("alc", ["AL_EXT_direct_context"])
41164116
]
41174117
[NativeFunction("openal", EntryPoint = "alGetErrorDirect")]
4118-
public static Constant<int, ErrorCode> GetErrorDirect(ContextHandle context) =>
4119-
(Constant<int, ErrorCode>)(int)GetErrorDirectRawDirect(context);
4118+
public static Constant<int, ALEnum, ErrorCode> GetErrorDirect(ContextHandle context) =>
4119+
(Constant<int, ALEnum, ErrorCode>)(int)GetErrorDirectRawDirect(context);
41204120

41214121
[NativeName("alGetErrorDirect")]
41224122
[DllImport("openal", ExactSpelling = true, EntryPoint = "alGetErrorDirect")]
@@ -12201,7 +12201,7 @@ public int GetEnumValueDirect(ContextHandle context, Ref<sbyte> ename) =>
1220112201
[MethodImpl(
1220212202
MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
1220312203
)]
12204-
public Constant<int, ErrorCode> GetError() => T.GetError();
12204+
public Constant<int, ALEnum, ErrorCode> GetError() => T.GetError();
1220512205

1220612206
[NativeName("alGetErrorDirect")]
1220712207
[
@@ -12212,7 +12212,7 @@ public int GetEnumValueDirect(ContextHandle context, Ref<sbyte> ename) =>
1221212212
[MethodImpl(
1221312213
MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
1221412214
)]
12215-
public Constant<int, ErrorCode> GetErrorDirect(ContextHandle context) =>
12215+
public Constant<int, ALEnum, ErrorCode> GetErrorDirect(ContextHandle context) =>
1221612216
T.GetErrorDirect(context);
1221712217

1221812218
[NativeName("alGetErrorDirect")]
@@ -21151,7 +21151,7 @@ public static int GetEnumValueDirect(ContextHandle context, Ref<sbyte> ename)
2115121151
[MethodImpl(
2115221152
MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
2115321153
)]
21154-
public static Constant<int, ErrorCode> GetError() => Underlying.Value!.GetError();
21154+
public static Constant<int, ALEnum, ErrorCode> GetError() => Underlying.Value!.GetError();
2115521155

2115621156
[NativeName("alGetErrorDirect")]
2115721157
[
@@ -21162,7 +21162,7 @@ public static int GetEnumValueDirect(ContextHandle context, Ref<sbyte> ename)
2116221162
[MethodImpl(
2116321163
MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
2116421164
)]
21165-
public static Constant<int, ErrorCode> GetErrorDirect(ContextHandle context) =>
21165+
public static Constant<int, ALEnum, ErrorCode> GetErrorDirect(ContextHandle context) =>
2116621166
Underlying.Value!.GetErrorDirect(context);
2116721167

2116821168
[NativeName("alGetErrorDirect")]
@@ -34299,14 +34299,14 @@ public static int GetEnumValueDirect(ContextHandle context, Ref<sbyte> ename) =>
3429934299
[SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
3430034300
[NativeFunction("openal", EntryPoint = "alGetError")]
3430134301
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
34302-
Constant<int, ErrorCode> IAL.GetError() =>
34303-
(Constant<int, ErrorCode>)(int)((IAL)this).GetErrorRaw();
34302+
Constant<int, ALEnum, ErrorCode> IAL.GetError() =>
34303+
(Constant<int, ALEnum, ErrorCode>)(int)((IAL)this).GetErrorRaw();
3430434304

3430534305
[NativeName("alGetError")]
3430634306
[SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
3430734307
[NativeFunction("openal", EntryPoint = "alGetError")]
3430834308
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
34309-
public static Constant<int, ErrorCode> GetError() => ThisThread.GetError();
34309+
public static Constant<int, ALEnum, ErrorCode> GetError() => ThisThread.GetError();
3431034310

3431134311
[NativeName("alGetErrorDirect")]
3431234312
[
@@ -34315,8 +34315,8 @@ Constant<int, ErrorCode> IAL.GetError() =>
3431534315
]
3431634316
[NativeFunction("openal", EntryPoint = "alGetErrorDirect")]
3431734317
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
34318-
Constant<int, ErrorCode> IAL.GetErrorDirect(ContextHandle context) =>
34319-
(Constant<int, ErrorCode>)(int)((IAL)this).GetErrorDirectRawDirect(context);
34318+
Constant<int, ALEnum, ErrorCode> IAL.GetErrorDirect(ContextHandle context) =>
34319+
(Constant<int, ALEnum, ErrorCode>)(int)((IAL)this).GetErrorDirectRawDirect(context);
3432034320

3432134321
[NativeName("alGetErrorDirect")]
3432234322
[
@@ -34325,7 +34325,7 @@ Constant<int, ErrorCode> IAL.GetErrorDirect(ContextHandle context) =>
3432534325
]
3432634326
[NativeFunction("openal", EntryPoint = "alGetErrorDirect")]
3432734327
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
34328-
public static Constant<int, ErrorCode> GetErrorDirect(ContextHandle context) =>
34328+
public static Constant<int, ALEnum, ErrorCode> GetErrorDirect(ContextHandle context) =>
3432934329
ThisThread.GetErrorDirect(context);
3433034330

3433134331
[NativeName("alGetErrorDirect")]

sources/OpenAL/OpenAL/al/ALContext.gen.cs

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ MaybeBool<sbyte> enable
185185
[SupportedApiProfile("alc", ["ALC_SOFT_system_events"])]
186186
[NativeFunction("openal", EntryPoint = "alcEventIsSupportedSOFT")]
187187
public static Constant<int, ALCEnum, EventSupportSOFT> EventIsSupportedSOFT(
188-
Constant<int, EventTypeSOFT> eventType,
188+
Constant<int, ALCEnum, SystemEventTypeSOFT> eventType,
189189
Constant<int, ALCEnum, DeviceTypeSOFT> deviceType
190190
) =>
191191
(Constant<int, ALCEnum, EventSupportSOFT>)
@@ -223,8 +223,8 @@ public static int GetEnumValue(DeviceHandle device, Ref<sbyte> enumname)
223223
[NativeName("alcGetError")]
224224
[SupportedApiProfile("alc", ["ALC_VERSION_1_0", "ALC_VERSION_1_1"], MinVersion = "1.0")]
225225
[NativeFunction("openal", EntryPoint = "alcGetError")]
226-
public static Constant<int, ErrorCode> GetError(DeviceHandle device) =>
227-
(Constant<int, ErrorCode>)(int)GetErrorRaw(device);
226+
public static Constant<int, ALCEnum, ContextErrorCode> GetError(DeviceHandle device) =>
227+
(Constant<int, ALCEnum, ContextErrorCode>)(int)GetErrorRaw(device);
228228

229229
[NativeName("alcGetError")]
230230
[DllImport("openal", ExactSpelling = true, EntryPoint = "alcGetError")]
@@ -797,7 +797,7 @@ public int EventIsSupportedSOFT(int eventType, int deviceType) =>
797797
MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
798798
)]
799799
public Constant<int, ALCEnum, EventSupportSOFT> EventIsSupportedSOFT(
800-
Constant<int, EventTypeSOFT> eventType,
800+
Constant<int, ALCEnum, SystemEventTypeSOFT> eventType,
801801
Constant<int, ALCEnum, DeviceTypeSOFT> deviceType
802802
) => T.EventIsSupportedSOFT(eventType, deviceType);
803803

@@ -842,7 +842,8 @@ public int GetEnumValue(DeviceHandle device, Ref<sbyte> enumname) =>
842842
[MethodImpl(
843843
MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
844844
)]
845-
public Constant<int, ErrorCode> GetError(DeviceHandle device) => T.GetError(device);
845+
public Constant<int, ALCEnum, ContextErrorCode> GetError(DeviceHandle device) =>
846+
T.GetError(device);
846847

847848
[NativeName("alcGetError")]
848849
[SupportedApiProfile("alc", ["ALC_VERSION_1_0", "ALC_VERSION_1_1"], MinVersion = "1.0")]
@@ -1424,7 +1425,7 @@ public static int EventIsSupportedSOFT(int eventType, int deviceType) =>
14241425
MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
14251426
)]
14261427
public static Constant<int, ALCEnum, EventSupportSOFT> EventIsSupportedSOFT(
1427-
Constant<int, EventTypeSOFT> eventType,
1428+
Constant<int, ALCEnum, SystemEventTypeSOFT> eventType,
14281429
Constant<int, ALCEnum, DeviceTypeSOFT> deviceType
14291430
) => Underlying.Value!.EventIsSupportedSOFT(eventType, deviceType);
14301431

@@ -1474,7 +1475,7 @@ public static int GetEnumValue(DeviceHandle device, Ref<sbyte> enumname)
14741475
[MethodImpl(
14751476
MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization
14761477
)]
1477-
public static Constant<int, ErrorCode> GetError(DeviceHandle device) =>
1478+
public static Constant<int, ALCEnum, ContextErrorCode> GetError(DeviceHandle device) =>
14781479
Underlying.Value!.GetError(device);
14791480

14801481
[NativeName("alcGetError")]
@@ -2337,7 +2338,7 @@ public static int EventIsSupportedSOFT(int eventType, int deviceType) =>
23372338
[NativeFunction("openal", EntryPoint = "alcEventIsSupportedSOFT")]
23382339
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
23392340
Constant<int, ALCEnum, EventSupportSOFT> IALContext.EventIsSupportedSOFT(
2340-
Constant<int, EventTypeSOFT> eventType,
2341+
Constant<int, ALCEnum, SystemEventTypeSOFT> eventType,
23412342
Constant<int, ALCEnum, DeviceTypeSOFT> deviceType
23422343
) =>
23432344
(Constant<int, ALCEnum, EventSupportSOFT>)
@@ -2348,7 +2349,7 @@ Constant<int, ALCEnum, DeviceTypeSOFT> deviceType
23482349
[NativeFunction("openal", EntryPoint = "alcEventIsSupportedSOFT")]
23492350
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
23502351
public static Constant<int, ALCEnum, EventSupportSOFT> EventIsSupportedSOFT(
2351-
Constant<int, EventTypeSOFT> eventType,
2352+
Constant<int, ALCEnum, SystemEventTypeSOFT> eventType,
23522353
Constant<int, ALCEnum, DeviceTypeSOFT> deviceType
23532354
) => ThisThread.EventIsSupportedSOFT(eventType, deviceType);
23542355

@@ -2434,14 +2435,14 @@ public static int GetEnumValue(DeviceHandle device, Ref<sbyte> enumname) =>
24342435
[SupportedApiProfile("alc", ["ALC_VERSION_1_0", "ALC_VERSION_1_1"], MinVersion = "1.0")]
24352436
[NativeFunction("openal", EntryPoint = "alcGetError")]
24362437
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
2437-
Constant<int, ErrorCode> IALContext.GetError(DeviceHandle device) =>
2438-
(Constant<int, ErrorCode>)(int)((IALContext)this).GetErrorRaw(device);
2438+
Constant<int, ALCEnum, ContextErrorCode> IALContext.GetError(DeviceHandle device) =>
2439+
(Constant<int, ALCEnum, ContextErrorCode>)(int)((IALContext)this).GetErrorRaw(device);
24392440

24402441
[NativeName("alcGetError")]
24412442
[SupportedApiProfile("alc", ["ALC_VERSION_1_0", "ALC_VERSION_1_1"], MinVersion = "1.0")]
24422443
[NativeFunction("openal", EntryPoint = "alcGetError")]
24432444
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
2444-
public static Constant<int, ErrorCode> GetError(DeviceHandle device) =>
2445+
public static Constant<int, ALCEnum, ContextErrorCode> GetError(DeviceHandle device) =>
24452446
ThisThread.GetError(device);
24462447

24472448
[NativeName("alcGetError")]

sources/OpenAL/OpenAL/al/IAL.gen.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2920,15 +2920,15 @@ Ref<int> piValues
29202920
[NativeName("alGetError")]
29212921
[SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
29222922
[NativeFunction("openal", EntryPoint = "alGetError")]
2923-
static abstract Constant<int, ErrorCode> GetError();
2923+
static abstract Constant<int, ALEnum, ErrorCode> GetError();
29242924

29252925
[NativeName("alGetErrorDirect")]
29262926
[
29272927
SupportedApiProfile("al", ["AL_EXT_direct_context"]),
29282928
SupportedApiProfile("alc", ["AL_EXT_direct_context"])
29292929
]
29302930
[NativeFunction("openal", EntryPoint = "alGetErrorDirect")]
2931-
static abstract Constant<int, ErrorCode> GetErrorDirect(ContextHandle context);
2931+
static abstract Constant<int, ALEnum, ErrorCode> GetErrorDirect(ContextHandle context);
29322932

29332933
[NativeName("alGetErrorDirect")]
29342934
[
@@ -8691,15 +8691,15 @@ Ref<int> piValues
86918691
[NativeName("alGetError")]
86928692
[SupportedApiProfile("al", ["AL_VERSION_1_0", "AL_VERSION_1_1"], MinVersion = "1.0")]
86938693
[NativeFunction("openal", EntryPoint = "alGetError")]
8694-
Constant<int, ErrorCode> GetError();
8694+
Constant<int, ALEnum, ErrorCode> GetError();
86958695

86968696
[NativeName("alGetErrorDirect")]
86978697
[
86988698
SupportedApiProfile("al", ["AL_EXT_direct_context"]),
86998699
SupportedApiProfile("alc", ["AL_EXT_direct_context"])
87008700
]
87018701
[NativeFunction("openal", EntryPoint = "alGetErrorDirect")]
8702-
Constant<int, ErrorCode> GetErrorDirect(ContextHandle context);
8702+
Constant<int, ALEnum, ErrorCode> GetErrorDirect(ContextHandle context);
87038703

87048704
[NativeName("alGetErrorDirect")]
87058705
[

0 commit comments

Comments
 (0)