Skip to content

Commit 65f3342

Browse files
curincurin
authored
Merge pull request #103 from dotnet/develop/3.0
[3.0] Rework naming system (dotnet#2565)
2 parents e726bb2 + 9d21e44 commit 65f3342

148 files changed

Lines changed: 3696 additions & 2777 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.silktouch/openal-clangsharp.stout‎

0 Bytes
Binary file not shown.

‎.silktouch/vulkan-clangsharp.stout‎

0 Bytes
Binary file not shown.

‎generator.json‎

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,12 @@
4242
"AddIncludes",
4343
"ClangScraper",
4444
"MarkNativeNames",
45+
"ExtractHandles",
4546
"ExtractNestedTyping",
4647
"TransformHandles",
4748
"TransformFunctions",
4849
"TransformProperties",
50+
"IdentifySharedPrefixes",
4951
"PrettifyNames",
5052
"TransformEnums",
5153
"AddVTables",
@@ -59,17 +61,23 @@
5961
"InputTestRoot": "tests/SDL"
6062
},
6163
"TransformHandles": {
62-
"AssumeMissingTypesOpaque": true,
63-
"UseDSL": true
64+
"UseDsl": true
6465
},
6566
"TransformFunctions": {
6667
"BoolTypes": {
6768
"SDL_bool": null
6869
}
6970
},
70-
"PrettifyNames": {
71+
"IdentifySharedPrefixes": {
7172
"GlobalPrefixHints": ["SDL"]
7273
},
74+
"PrettifyNames": {
75+
"Affixes": {
76+
"SharedPrefix": {
77+
"Remove": true
78+
}
79+
}
80+
},
7381
"TransformEnums": {
7482
"AddNoneMemberToFlags": true,
7583
"RewriteMemberValues": true
@@ -95,6 +103,7 @@
95103
"MixKhronosData",
96104
"AddOpaqueStructs",
97105
"TransformFunctions",
106+
"IdentifySharedPrefixes",
98107
"PrettifyNames",
99108
"TransformEnums",
100109
"AddVTables",
@@ -171,14 +180,17 @@
171180
}
172181
]
173182
},
174-
"PrettifyNames": {
183+
"IdentifySharedPrefixes": {
175184
"GlobalPrefixHints": ["gl"],
176185
"PrefixOverrides": {
177186
"SyncObjectMask": "GL_SYNC",
178187
"OcclusionQueryParameterNameNV": "GL",
179188
"TexStorageAttribs": "GL",
180-
"ContainerType": "GL"
181-
},
189+
"ContainerType": "GL",
190+
"SeparableTargetEXT": "GL"
191+
}
192+
},
193+
"PrettifyNames": {
182194
"Affixes": {
183195
"HandleType": {
184196
"Order": 1
@@ -197,6 +209,9 @@
197209
},
198210
"KhronosNonExclusiveVendor": {
199211
"Remove": true
212+
},
213+
"SharedPrefix": {
214+
"Remove": true
200215
}
201216
}
202217
},
@@ -228,10 +243,12 @@
228243
"ChangeNativeClass",
229244
"AddApiProfiles",
230245
"MixKhronosData",
246+
"ExtractHandles",
231247
"ExtractNestedTyping",
232248
"TransformHandles",
233249
"InterceptNativeFunctions",
234250
"TransformFunctions",
251+
"IdentifySharedPrefixes",
235252
"PrettifyNames",
236253
"TransformEnums",
237254
"AddVTables",
@@ -294,25 +311,20 @@
294311
}
295312
]
296313
},
314+
"IdentifySharedPrefixes": {
315+
"GlobalPrefixHints": ["alc", "al"]
316+
},
297317
"PrettifyNames": {
298-
"GlobalPrefixHints": ["alc", "al"],
299318
"NameOverrides": {
300319
"ALContext": "ALContext",
301320
"EFXEAXREVERBPROPERTIES": "EfxEaxReverbProperties",
302-
"EFXEAXREVERBPROPERTIES_flReflectionsPan": "EfxEaxReverbPropertiesFlReflectionsPan",
303-
"EFXEAXREVERBPROPERTIES_flLateReverbPan": "EfxEaxReverbPropertiesFlLateReverbPan",
304321
"ALCcontextHandle": "ContextHandle",
305322
"ALCdeviceHandle": "DeviceHandle",
306323
"ALBUFFERCALLBACKTYPESOFT": "BufferCallbackSOFT",
307-
"ALBUFFERCALLBACKTYPESOFTDelegate": "BufferCallbackDelegateSOFT",
308324
"ALCEVENTPROCTYPESOFT": "ContextEventProcSOFT",
309-
"ALCEVENTPROCTYPESOFTDelegate": "ContextEventProcDelegateSOFT",
310325
"ALEVENTPROCSOFT": "EventProcSOFT",
311-
"ALEVENTPROCSOFTDelegate": "EventProcDelegateSOFT",
312326
"ALDEBUGPROCEXT": "DebugProcEXT",
313-
"ALDEBUGPROCEXTDelegate": "DebugProcDelegateEXT",
314-
"LPALFOLDBACKCALLBACK": "FoldbackCallback",
315-
"LPALFOLDBACKCALLBACKDelegate": "FoldbackCallbackDelegate"
327+
"LPALFOLDBACKCALLBACK": "FoldbackCallback"
316328
},
317329
"Affixes": {
318330
"HandleType": {
@@ -332,6 +344,9 @@
332344
},
333345
"KhronosNonExclusiveVendor": {
334346
"Remove": true
347+
},
348+
"SharedPrefix": {
349+
"Remove": true
335350
}
336351
}
337352
},
@@ -347,8 +362,7 @@
347362
"BenefitOfTheDoubtArrayTransformation": true
348363
},
349364
"TransformHandles": {
350-
"AssumeMissingTypesOpaque": true,
351-
"UseDSL": true
365+
"UseDsl": true
352366
},
353367
"StripAttributes": {
354368
"Remove": [
@@ -366,13 +380,15 @@
366380
"AddIncludes",
367381
"ClangScraper",
368382
"MarkNativeNames",
383+
"ExtractHandles",
369384
"ExtractNestedTyping",
370385
"TransformHandles",
371386
"MixKhronosData",
372387
"AddApiProfiles",
373388
"InterceptNativeFunctions",
374389
"TransformFunctions",
375390
"TransformProperties",
391+
"IdentifySharedPrefixes",
376392
"PrettifyNames",
377393
"TransformEnums",
378394
"AddVTables",
@@ -419,15 +435,16 @@
419435
}
420436
},
421437
"TransformHandles": {
422-
"AssumeMissingTypesOpaque": true,
423-
"UseDSL": true
438+
"UseDsl": true
424439
},
425-
"PrettifyNames": {
426-
"GlobalPrefixHints": ["PFN_vk","vk"],
440+
"IdentifySharedPrefixes": {
441+
"GlobalPrefixHints": ["PFN_vk", "vk"],
427442
"PrefixOverrides": {
428443
"VkPipelineCreateFlags2": "VK_PIPELINE_CREATE_2",
429444
"VkMemoryDecompressionMethodFlagsEXT": "VK_MEMORY_DECOMPRESSION_METHOD"
430-
},
445+
}
446+
},
447+
"PrettifyNames": {
431448
"NameOverrides": {
432449
"numAABBs": "NumAabbs"
433450
},
@@ -446,6 +463,9 @@
446463
},
447464
"KhronosHandleType": {
448465
"Remove": true
466+
},
467+
"SharedPrefix": {
468+
"Remove": true
449469
}
450470
}
451471
},

‎sources/OpenAL/OpenAL/al/BufferCallbackSOFT.gen.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Silk.NET.OpenAL;
1919

2020
public BufferCallbackSOFT(delegate* unmanaged<void*, void*, int, int> ptr) => Pointer = ptr;
2121

22-
public BufferCallbackSOFT(BufferCallbackDelegateSOFT proc) =>
22+
public BufferCallbackSOFT(BufferCallbackSOFTDelegate proc) =>
2323
Pointer = SilkMarshal.DelegateToPtr(proc);
2424

2525
public void Dispose() => SilkMarshal.Free(Pointer);

sources/OpenAL/OpenAL/al/BufferCallbackDelegateSOFT.gen.cs renamed to sources/OpenAL/OpenAL/al/BufferCallbackSOFTDelegate.gen.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
namespace Silk.NET.OpenAL;
1212

1313
[NativeName("ALBUFFERCALLBACKTYPESOFT")]
14-
public unsafe delegate int BufferCallbackDelegateSOFT(void* arg0, void* arg1, int arg2);
14+
public unsafe delegate int BufferCallbackSOFTDelegate(void* arg0, void* arg1, int arg2);

‎sources/OpenAL/OpenAL/al/ContextEventProcSOFT.gen.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public ContextEventProcSOFT(
2121
delegate* unmanaged<int, int, DeviceHandle, int, sbyte*, void*, void> ptr
2222
) => Pointer = ptr;
2323

24-
public ContextEventProcSOFT(ContextEventProcDelegateSOFT proc) =>
24+
public ContextEventProcSOFT(ContextEventProcSOFTDelegate proc) =>
2525
Pointer = SilkMarshal.DelegateToPtr(proc);
2626

2727
public void Dispose() => SilkMarshal.Free(Pointer);

sources/OpenAL/OpenAL/al/ContextEventProcDelegateSOFT.gen.cs renamed to sources/OpenAL/OpenAL/al/ContextEventProcSOFTDelegate.gen.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace Silk.NET.OpenAL;
1212

1313
[NativeName("ALCEVENTPROCTYPESOFT")]
14-
public unsafe delegate void ContextEventProcDelegateSOFT(
14+
public unsafe delegate void ContextEventProcSOFTDelegate(
1515
int arg0,
1616
int arg1,
1717
DeviceHandle arg2,

‎sources/OpenAL/OpenAL/al/DebugProcEXT.gen.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace Silk.NET.OpenAL;
2020
public DebugProcEXT(delegate* unmanaged<int, int, uint, int, int, sbyte*, void*, void> ptr) =>
2121
Pointer = ptr;
2222

23-
public DebugProcEXT(DebugProcDelegateEXT proc) => Pointer = SilkMarshal.DelegateToPtr(proc);
23+
public DebugProcEXT(DebugProcEXTDelegate proc) => Pointer = SilkMarshal.DelegateToPtr(proc);
2424

2525
public void Dispose() => SilkMarshal.Free(Pointer);
2626

sources/OpenAL/OpenAL/al/DebugProcDelegateEXT.gen.cs renamed to sources/OpenAL/OpenAL/al/DebugProcEXTDelegate.gen.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace Silk.NET.OpenAL;
1212

1313
[NativeName("ALDEBUGPROCEXT")]
14-
public unsafe delegate void DebugProcDelegateEXT(
14+
public unsafe delegate void DebugProcEXTDelegate(
1515
int arg0,
1616
int arg1,
1717
uint arg2,

‎sources/OpenAL/OpenAL/al/EventProcSOFT.gen.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace Silk.NET.OpenAL;
2020
public EventProcSOFT(delegate* unmanaged<int, uint, uint, int, sbyte*, void*, void> ptr) =>
2121
Pointer = ptr;
2222

23-
public EventProcSOFT(EventProcDelegateSOFT proc) => Pointer = SilkMarshal.DelegateToPtr(proc);
23+
public EventProcSOFT(EventProcSOFTDelegate proc) => Pointer = SilkMarshal.DelegateToPtr(proc);
2424

2525
public void Dispose() => SilkMarshal.Free(Pointer);
2626

0 commit comments

Comments
 (0)