Skip to content

Commit 6d3a00f

Browse files
HelcoHelco
committed
Add support for bitfields
1 parent 3004ce3 commit 6d3a00f

File tree

6 files changed

+139
-13
lines changed

6 files changed

+139
-13
lines changed

‎src/CodeGenerator/ImguiDefinitions.cs‎

Lines changed: 62 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ static int GetInt(JToken token, string key)
2222
if (v == null) return 0;
2323
return v.ToObject<int>();
2424
}
25+
26+
static int? GetOptionalInt(JToken token, string key)
27+
{
28+
var v = token[key];
29+
if (v == null) return null;
30+
return v.ToObject<int>();
31+
}
32+
2533
public void LoadFrom(string directory)
2634
{
2735

@@ -93,7 +101,9 @@ public void LoadFrom(string directory)
93101
v["type"].ToString(),
94102
GetInt(v, "size"),
95103
v["template_type"]?.ToString(),
96-
Enums);
104+
Enums,
105+
typeVariants: null,
106+
GetOptionalInt(v, "bitfield"));
97107
}).Where(tr => tr != null).ToArray();
98108
return new TypeDefinition(name, fields);
99109
}).Where(x => x != null).ToArray();
@@ -336,12 +346,34 @@ class TypeDefinition
336346
{
337347
public string Name { get; }
338348
public TypeReference[] Fields { get; }
349+
public BitField[] BitFields { get; }
339350

340351
public TypeDefinition(string name, TypeReference[] fields)
341352
{
342353
Name = name;
343354
Fields = fields;
355+
356+
var bitFields = new List<BitField>();
357+
int bitFieldStartI = -1;
358+
for (int i = 0; i < fields.Length; i++)
359+
{
360+
if (fields[i].BitSize.HasValue && bitFieldStartI < 0)
361+
bitFieldStartI = i;
362+
363+
if (!fields[i].BitSize.HasValue && bitFieldStartI >= 0)
364+
{
365+
bitFields.Add(new BitField(bitFields.Count, fields[bitFieldStartI..i]));
366+
bitFieldStartI = -1;
367+
}
368+
}
369+
if (bitFieldStartI >= 0)
370+
bitFields.Add(new BitField(bitFields.Count, fields[bitFieldStartI..]));
371+
BitFields = bitFields.ToArray();
344372
}
373+
374+
public BitField GetBitFieldContaining(TypeReference field) =>
375+
BitFields.FirstOrDefault(bitField => bitField.Fields.Contains(field))
376+
?? throw new ArgumentException("Given is not part of any bit field");
345377
}
346378

347379
class TypeReference
@@ -353,17 +385,18 @@ class TypeReference
353385
public bool IsFunctionPointer { get; }
354386
public string[] TypeVariants { get; }
355387
public bool IsEnum { get; }
388+
public int? BitSize { get; }
356389

357390
public TypeReference(string name, string type, int asize, EnumDefinition[] enums)
358-
: this(name, type, asize, null, enums, null) { }
391+
: this(name, type, asize, null, enums, null, null) { }
359392

360393
public TypeReference(string name, string type, int asize, EnumDefinition[] enums, string[] typeVariants)
361-
: this(name, type, asize, null, enums, typeVariants) { }
394+
: this(name, type, asize, null, enums, typeVariants, null) { }
362395

363396
public TypeReference(string name, string type, int asize, string templateType, EnumDefinition[] enums)
364-
: this(name, type, asize, templateType, enums, null) { }
397+
: this(name, type, asize, templateType, enums, null, null) { }
365398

366-
public TypeReference(string name, string type, int asize, string templateType, EnumDefinition[] enums, string[] typeVariants)
399+
public TypeReference(string name, string type, int asize, string templateType, EnumDefinition[] enums, string[] typeVariants, int? bitSize)
367400
{
368401
Name = name;
369402
Type = type.Replace("const", string.Empty).Trim();
@@ -410,6 +443,8 @@ public TypeReference(string name, string type, int asize, string templateType, E
410443
TypeVariants = typeVariants;
411444

412445
IsEnum = enums.Any(t => t.Names.Contains(type) || t.FriendlyNames.Contains(type) || TypeInfo.WellKnownEnums.Contains(type));
446+
447+
BitSize = bitSize;
413448
}
414449

415450
private int ParseSizeString(string sizePart, EnumDefinition[] enums)
@@ -453,6 +488,28 @@ public TypeReference WithVariant(int variantIndex, EnumDefinition[] enums)
453488
}
454489
}
455490

491+
class BitField
492+
{
493+
public string Name { get; }
494+
public string Type { get; }
495+
public TypeReference[] Fields { get; }
496+
497+
public BitField(int index, IEnumerable<TypeReference> fields)
498+
{
499+
Name = $"_bitField_{index}";
500+
Fields = fields.ToArray();
501+
Type = TypeInfo.GetTypeForBitfield(fields.Sum(f => f.BitSize.Value));
502+
}
503+
504+
public int OffsetOf(TypeReference field)
505+
{
506+
var fieldIndex = Array.IndexOf(Fields, field);
507+
if (fieldIndex < 0)
508+
throw new ArgumentException("Given field is not part of the bit field");
509+
return Fields.Take(fieldIndex).Sum(f => f.BitSize.Value);
510+
}
511+
}
512+
456513
class FunctionDefinition
457514
{
458515
public string Name { get; }

‎src/CodeGenerator/Program.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,14 @@ static void Main(string[] args)
139139
}
140140
}
141141
}
142+
else if (field.BitSize.HasValue)
143+
{
144+
var bitField = td.GetBitFieldContaining(field);
145+
if (bitField.OffsetOf(field) > 0)
146+
continue;
147+
148+
writer.WriteLine($"public {bitField.Type} {bitField.Name};");
149+
}
142150
else
143151
{
144152
writer.WriteLine($"public {typeStr} {field.Name};");
@@ -170,6 +178,17 @@ static void Main(string[] args)
170178
string addrTarget = TypeInfo.LegalFixedTypes.Contains(rawType) ? $"NativePtr->{field.Name}" : $"&NativePtr->{field.Name}_0";
171179
writer.WriteLine($"public RangeAccessor<{typeStr}> {field.Name} => new RangeAccessor<{typeStr}>({addrTarget}, {field.ArraySize});");
172180
}
181+
else if (field.BitSize.HasValue)
182+
{
183+
var bitField = td.GetBitFieldContaining(field);
184+
var offset = bitField.OffsetOf(field);
185+
var mask = (ulong)(1 << field.BitSize) - 1 << offset;
186+
187+
writer.PushBlock($"public {typeStr} {field.Name}");
188+
writer.WriteLine($"get => ({typeStr})Util.GetBits(NativePtr->{bitField.Name}, {offset}, {field.BitSize});");
189+
writer.WriteLine($"set => NativePtr->{bitField.Name} = Util.SetBits(NativePtr->{bitField.Name}, {offset}, {field.BitSize}, ({bitField.Type})value);");
190+
writer.PopBlock();
191+
}
173192
else if (typeStr.Contains("ImVector"))
174193
{
175194
string vectorElementType = GetTypeString(field.TemplateType, false);

‎src/CodeGenerator/TypeInfo.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,5 +160,14 @@ public class TypeInfo
160160
"igInputTextMultiline",
161161
"igInputTextWithHint"
162162
};
163+
164+
public static string GetTypeForBitfield(int size) => size switch
165+
{
166+
_ when size <= 8 => "byte",
167+
_ when size <= 16 => "ushort",
168+
_ when size <= 32 => "uint",
169+
_ when size <= 64 => "ulong",
170+
_ => throw new System.NotSupportedException("Unsupported bitfield size: " + size)
171+
};
163172
}
164173
}

‎src/ImGui.NET/Generated/ImFontGlyph.gen.cs‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ namespace ImGuiNET
77
{
88
public unsafe partial struct ImFontGlyph
99
{
10-
public uint Colored;
11-
public uint Visible;
12-
public uint Codepoint;
10+
public uint _bitField_0;
1311
public float AdvanceX;
1412
public float X0;
1513
public float Y0;
@@ -28,9 +26,21 @@ public unsafe partial struct ImFontGlyphPtr
2826
public static implicit operator ImFontGlyphPtr(ImFontGlyph* nativePtr) => new ImFontGlyphPtr(nativePtr);
2927
public static implicit operator ImFontGlyph* (ImFontGlyphPtr wrappedPtr) => wrappedPtr.NativePtr;
3028
public static implicit operator ImFontGlyphPtr(IntPtr nativePtr) => new ImFontGlyphPtr(nativePtr);
31-
public ref uint Colored => ref Unsafe.AsRef<uint>(&NativePtr->Colored);
32-
public ref uint Visible => ref Unsafe.AsRef<uint>(&NativePtr->Visible);
33-
public ref uint Codepoint => ref Unsafe.AsRef<uint>(&NativePtr->Codepoint);
29+
public uint Colored
30+
{
31+
get => (uint)Util.GetBits(NativePtr->_bitField_0, 0, 1);
32+
set => NativePtr->_bitField_0 = Util.SetBits(NativePtr->_bitField_0, 0, 1, (uint)value);
33+
}
34+
public uint Visible
35+
{
36+
get => (uint)Util.GetBits(NativePtr->_bitField_0, 1, 1);
37+
set => NativePtr->_bitField_0 = Util.SetBits(NativePtr->_bitField_0, 1, 1, (uint)value);
38+
}
39+
public uint Codepoint
40+
{
41+
get => (uint)Util.GetBits(NativePtr->_bitField_0, 2, 30);
42+
set => NativePtr->_bitField_0 = Util.SetBits(NativePtr->_bitField_0, 2, 30, (uint)value);
43+
}
3444
public ref float AdvanceX => ref Unsafe.AsRef<float>(&NativePtr->AdvanceX);
3545
public ref float X0 => ref Unsafe.AsRef<float>(&NativePtr->X0);
3646
public ref float Y0 => ref Unsafe.AsRef<float>(&NativePtr->Y0);

‎src/ImGui.NET/Generated/ImGuiTableColumnSortSpecs.gen.cs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public unsafe partial struct ImGuiTableColumnSortSpecs
1010
public uint ColumnUserID;
1111
public short ColumnIndex;
1212
public short SortOrder;
13-
public ImGuiSortDirection SortDirection;
13+
public byte _bitField_0;
1414
}
1515
public unsafe partial struct ImGuiTableColumnSortSpecsPtr
1616
{
@@ -23,7 +23,11 @@ public unsafe partial struct ImGuiTableColumnSortSpecsPtr
2323
public ref uint ColumnUserID => ref Unsafe.AsRef<uint>(&NativePtr->ColumnUserID);
2424
public ref short ColumnIndex => ref Unsafe.AsRef<short>(&NativePtr->ColumnIndex);
2525
public ref short SortOrder => ref Unsafe.AsRef<short>(&NativePtr->SortOrder);
26-
public ref ImGuiSortDirection SortDirection => ref Unsafe.AsRef<ImGuiSortDirection>(&NativePtr->SortDirection);
26+
public ImGuiSortDirection SortDirection
27+
{
28+
get => (ImGuiSortDirection)Util.GetBits(NativePtr->_bitField_0, 0, 8);
29+
set => NativePtr->_bitField_0 = Util.SetBits(NativePtr->_bitField_0, 0, 8, (byte)value);
30+
}
2731
public void Destroy()
2832
{
2933
ImGuiNative.ImGuiTableColumnSortSpecs_destroy((ImGuiTableColumnSortSpecs*)(NativePtr));

‎src/ImGui.NET/Util.cs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,32 @@ internal static int GetUtf8(string s, int start, int length, byte* utf8Bytes, in
9393
return Encoding.UTF8.GetBytes(utf16Ptr + start, length, utf8Bytes, utf8ByteCount);
9494
}
9595
}
96+
97+
internal static byte SetBits(byte oldValue, int offset, int bitCount, byte newBits)
98+
{
99+
var mask = (byte)((1 << bitCount) - 1 << offset);
100+
return (byte)((oldValue & ~mask) | (newBits << offset & mask));
101+
}
102+
103+
internal static ushort SetBits(ushort oldValue, int offset, int bitCount, ushort newBits)
104+
{
105+
var mask = (ushort)((1 << bitCount) - 1 << offset);
106+
return (ushort)((oldValue & ~mask) | (newBits << offset & mask));
107+
}
108+
109+
internal static uint SetBits(uint oldValue, int offset, int bitCount, uint newBits)
110+
{
111+
var mask = (uint)((1 << bitCount) - 1 << offset);
112+
return (uint)((oldValue & ~mask) | (newBits << offset & mask));
113+
}
114+
115+
internal static ulong SetBits(ulong oldValue, int offset, int bitCount, ulong newBits)
116+
{
117+
var mask = (ulong)((1 << bitCount) - 1 << offset);
118+
return (ulong)((oldValue & ~mask) | (newBits << offset & mask));
119+
}
120+
121+
internal static ulong GetBits(ulong value, int offset, int bitCount) =>
122+
(value >> offset) & (1UL << bitCount) - 1;
96123
}
97124
}

0 commit comments

Comments
 (0)