Skip to content
This repository has been archived by the owner on Oct 8, 2023. It is now read-only.

Bump ext/flecs from 10e2de3 to 41fb856 #208

Merged
merged 2 commits into from
Aug 27, 2023
Merged

Bump ext/flecs from 10e2de3 to 41fb856 #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3e4ab8
Bump ext/flecs from `10e2de3` to `41fb856`
dependabot[bot] Aug 25, 2023
b38fee9
Update C# bindings
lithiumtoast Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/flecs
Open in desktop
Submodule flecs updated 16 files
+182 −17 flecs.c
+23 −2 flecs.h
+15 −2 include/flecs/addons/stats.h
+1 −0 include/flecs/private/api_types.h
+7 −0 include/flecs/private/strbuf.h
+2 −2 src/addons/json/serialize.c
+17 −1 src/addons/pipeline/pipeline.c
+2 −1 src/addons/pipeline/pipeline.h
+19 −1 src/addons/rest.c
+78 −5 src/addons/stats.c
+12 −0 src/datastructures/strbuf.c
+4 −0 src/iter.c
+48 −7 src/query.c
+5 −1 test/api/project.json
+138 −0 test/api/src/Query.c
+21 −1 test/api/src/main.c
2 changes: 1 addition & 1 deletion src/cs/production/Interop.Flecs.Core/Generated/AssemblyAttributes.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// To disable generating this file set `isEnabledGenerateAssemblyAttributes` to `false` in the config file for generating C# code.
// <auto-generated>
// This code was generated by the following tool on 2023-08-24 00:20:45 GMT+00:00:
// This code was generated by the following tool on 2023-08-25 00:39:40 GMT+00:00:
// https://github.com/bottlenoselabs/c2cs (v6.1.3.0)
//
// Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down
73 changes: 52 additions & 21 deletions src/cs/production/Interop.Flecs.Core/Generated/PInvoke.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// <auto-generated>
// This code was generated by the following tool on 2023-08-24 00:20:45 GMT+00:00:
// This code was generated by the following tool on 2023-08-25 00:39:40 GMT+00:00:
// https://github.com/bottlenoselabs/c2cs (v6.1.3.0)
//
// Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down Expand Up @@ -2292,6 +2292,11 @@ public static unsafe partial class PInvoke
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial CBool ecs_strbuf_append(ecs_strbuf_t* buffer, CString fmt);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_strbuf_appendbool")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
public static partial CBool ecs_strbuf_appendbool(ecs_strbuf_t* buffer, CBool v);

[CNode(Kind = "Function")]
[LibraryImport(LibraryName, EntryPoint = "ecs_strbuf_appendch")]
[UnmanagedCallConv(CallConvs = new[] { typeof(CallConvCdecl) })]
Expand Down Expand Up @@ -3892,13 +3897,13 @@ public struct EcsOpaque
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 96, Pack = 8)]
[StructLayout(LayoutKind.Explicit, Size = 120, Pack = 8)]
public struct EcsPipelineStats
{
[FieldOffset(0)] // size = 8
public EcsStatsHeader hdr;

[FieldOffset(8)] // size = 88
[FieldOffset(8)] // size = 112
public ecs_pipeline_stats_t stats;
}

Expand Down Expand Up @@ -5417,7 +5422,7 @@ public struct ecs_iter_private_t_ANONYMOUS_FIELD0
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 600, Pack = 8)]
[StructLayout(LayoutKind.Explicit, Size = 608, Pack = 8)]
public struct ecs_iter_t
{
[FieldOffset(0)] // size = 8
Expand Down Expand Up @@ -5535,9 +5540,12 @@ public struct ecs_iter_t
public ecs_iter_action_t callback;

[FieldOffset(584)] // size = 8
public ecs_iter_fini_action_t fini;
public ecs_iter_action_t set_var;

[FieldOffset(592)] // size = 8
public ecs_iter_fini_action_t fini;

[FieldOffset(600)] // size = 8
public ecs_iter_t* chain_it;
}

Expand Down Expand Up @@ -6260,7 +6268,7 @@ public struct ecs_pipeline_desc_t
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 88, Pack = 8)]
[StructLayout(LayoutKind.Explicit, Size = 112, Pack = 8)]
public struct ecs_pipeline_stats_t
{
[FieldOffset(0)] // size = 1
Expand All @@ -6269,19 +6277,22 @@ public struct ecs_pipeline_stats_t
[FieldOffset(8)] // size = 24
public ecs_vec_t systems;

[FieldOffset(32)] // size = 40
[FieldOffset(32)] // size = 24
public ecs_vec_t sync_points;

[FieldOffset(56)] // size = 40
public ecs_map_t system_stats;

[FieldOffset(72)] // size = 4
[FieldOffset(96)] // size = 4
public int t;

[FieldOffset(76)] // size = 4
[FieldOffset(100)] // size = 4
public int system_count;

[FieldOffset(80)] // size = 4
[FieldOffset(104)] // size = 4
public int active_system_count;

[FieldOffset(84)] // size = 4
[FieldOffset(108)] // size = 4
public int rebuild_count;
}

Expand Down Expand Up @@ -6815,6 +6826,32 @@ public struct ecs_struct_desc_t
}
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 2424, Pack = 8)]
public struct ecs_sync_stats_t
{
[FieldOffset(0)] // size = 8
public long first_;

[FieldOffset(8)] // size = 1200
public ecs_metric_t time_spent;

[FieldOffset(1208)] // size = 1200
public ecs_metric_t commands_enqueued;

[FieldOffset(2408)] // size = 8
public long last_;

[FieldOffset(2416)] // size = 4
public int system_count;

[FieldOffset(2420)] // size = 1
public CBool multi_threaded;

[FieldOffset(2421)] // size = 1
public CBool no_readonly;
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 2696, Pack = 8)]
public struct ecs_system_desc_t
Expand Down Expand Up @@ -6863,7 +6900,7 @@ public struct ecs_system_desc_t
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 8448, Pack = 8)]
[StructLayout(LayoutKind.Explicit, Size = 6048, Pack = 8)]
public struct ecs_system_stats_t
{
[FieldOffset(0)] // size = 8
Expand All @@ -6875,19 +6912,13 @@ public struct ecs_system_stats_t
[FieldOffset(1208)] // size = 1200
public ecs_metric_t invoke_count;

[FieldOffset(2408)] // size = 1200
public ecs_metric_t active;

[FieldOffset(3608)] // size = 1200
public ecs_metric_t enabled;

[FieldOffset(4808)] // size = 8
[FieldOffset(2408)] // size = 8
public long last_;

[FieldOffset(4816)] // size = 1
[FieldOffset(2416)] // size = 1
public CBool task;

[FieldOffset(4824)] // size = 3624
[FieldOffset(2424)] // size = 3624
public ecs_query_stats_t query;
}

Expand Down
2 changes: 1 addition & 1 deletion src/cs/production/Interop.Flecs.Unity/Generated/AssemblyAttributes.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// To disable generating this file set `isEnabledGenerateAssemblyAttributes` to `false` in the config file for generating C# code.
// <auto-generated>
// This code was generated by the following tool on 2023-08-24 00:21:00 GMT+00:00:
// This code was generated by the following tool on 2023-08-25 00:39:56 GMT+00:00:
// https://github.com/bottlenoselabs/c2cs (v6.1.3.0)
//
// Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down
72 changes: 51 additions & 21 deletions src/cs/production/Interop.Flecs.Unity/Generated/PInvoke.gen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// <auto-generated>
// This code was generated by the following tool on 2023-08-24 00:21:00 GMT+00:00:
// This code was generated by the following tool on 2023-08-25 00:39:56 GMT+00:00:
// https://github.com/bottlenoselabs/c2cs (v6.1.3.0)
//
// Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down Expand Up @@ -1840,6 +1840,10 @@ public static unsafe partial class PInvoke
[DllImport(LibraryName, EntryPoint = "ecs_strbuf_append", CallingConvention = CallingConvention.Cdecl)]
public static extern CBool ecs_strbuf_append(ecs_strbuf_t* buffer, CString fmt);

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "ecs_strbuf_appendbool", CallingConvention = CallingConvention.Cdecl)]
public static extern CBool ecs_strbuf_appendbool(ecs_strbuf_t* buffer, CBool v);

[CNode(Kind = "Function")]
[DllImport(LibraryName, EntryPoint = "ecs_strbuf_appendch", CallingConvention = CallingConvention.Cdecl)]
public static extern CBool ecs_strbuf_appendch(ecs_strbuf_t* buffer, CChar ch);
Expand Down Expand Up @@ -3676,13 +3680,13 @@ public struct EcsOpaque
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 96, Pack = 8)]
[StructLayout(LayoutKind.Explicit, Size = 120, Pack = 8)]
public struct EcsPipelineStats
{
[FieldOffset(0)] // size = 8
public EcsStatsHeader hdr;

[FieldOffset(8)] // size = 88
[FieldOffset(8)] // size = 112
public ecs_pipeline_stats_t stats;
}

Expand Down Expand Up @@ -5201,7 +5205,7 @@ public struct ecs_iter_private_t_ANONYMOUS_FIELD0
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 600, Pack = 8)]
[StructLayout(LayoutKind.Explicit, Size = 608, Pack = 8)]
public struct ecs_iter_t
{
[FieldOffset(0)] // size = 8
Expand Down Expand Up @@ -5319,9 +5323,12 @@ public struct ecs_iter_t
public ecs_iter_action_t callback;

[FieldOffset(584)] // size = 8
public ecs_iter_fini_action_t fini;
public ecs_iter_action_t set_var;

[FieldOffset(592)] // size = 8
public ecs_iter_fini_action_t fini;

[FieldOffset(600)] // size = 8
public ecs_iter_t* chain_it;
}

Expand Down Expand Up @@ -6044,7 +6051,7 @@ public struct ecs_pipeline_desc_t
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 88, Pack = 8)]
[StructLayout(LayoutKind.Explicit, Size = 112, Pack = 8)]
public struct ecs_pipeline_stats_t
{
[FieldOffset(0)] // size = 1
Expand All @@ -6053,19 +6060,22 @@ public struct ecs_pipeline_stats_t
[FieldOffset(8)] // size = 24
public ecs_vec_t systems;

[FieldOffset(32)] // size = 40
[FieldOffset(32)] // size = 24
public ecs_vec_t sync_points;

[FieldOffset(56)] // size = 40
public ecs_map_t system_stats;

[FieldOffset(72)] // size = 4
[FieldOffset(96)] // size = 4
public int t;

[FieldOffset(76)] // size = 4
[FieldOffset(100)] // size = 4
public int system_count;

[FieldOffset(80)] // size = 4
[FieldOffset(104)] // size = 4
public int active_system_count;

[FieldOffset(84)] // size = 4
[FieldOffset(108)] // size = 4
public int rebuild_count;
}

Expand Down Expand Up @@ -6599,6 +6609,32 @@ public struct ecs_struct_desc_t
}
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 2424, Pack = 8)]
public struct ecs_sync_stats_t
{
[FieldOffset(0)] // size = 8
public long first_;

[FieldOffset(8)] // size = 1200
public ecs_metric_t time_spent;

[FieldOffset(1208)] // size = 1200
public ecs_metric_t commands_enqueued;

[FieldOffset(2408)] // size = 8
public long last_;

[FieldOffset(2416)] // size = 4
public int system_count;

[FieldOffset(2420)] // size = 1
public CBool multi_threaded;

[FieldOffset(2421)] // size = 1
public CBool no_readonly;
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 2696, Pack = 8)]
public struct ecs_system_desc_t
Expand Down Expand Up @@ -6647,7 +6683,7 @@ public struct ecs_system_desc_t
}

[CNode(Kind = "Struct")]
[StructLayout(LayoutKind.Explicit, Size = 8448, Pack = 8)]
[StructLayout(LayoutKind.Explicit, Size = 6048, Pack = 8)]
public struct ecs_system_stats_t
{
[FieldOffset(0)] // size = 8
Expand All @@ -6659,19 +6695,13 @@ public struct ecs_system_stats_t
[FieldOffset(1208)] // size = 1200
public ecs_metric_t invoke_count;

[FieldOffset(2408)] // size = 1200
public ecs_metric_t active;

[FieldOffset(3608)] // size = 1200
public ecs_metric_t enabled;

[FieldOffset(4808)] // size = 8
[FieldOffset(2408)] // size = 8
public long last_;

[FieldOffset(4816)] // size = 1
[FieldOffset(2416)] // size = 1
public CBool task;

[FieldOffset(4824)] // size = 3624
[FieldOffset(2424)] // size = 3624
public ecs_query_stats_t query;
}

Expand Down