#1525 Fix issue where sync point wasn't inserted for InOutNone term

SanderMertens · Jan 21, 2025 · b0e71d9 · b0e71d9
1 parent 4ce8b97
commit b0e71d9
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 4 deletions.
diff --git a/distr/flecs.c b/distr/flecs.c
@@ -53976,7 +53976,7 @@ bool flecs_pipeline_check_term(
     (void)world;
 
     ecs_term_ref_t *src = &term->src;
-    if (term->inout == EcsInOutNone || term->inout == EcsInOutFilter) {
+    if (term->inout == EcsInOutFilter) {
         return false;
     }
 

diff --git a/src/addons/pipeline/pipeline.c b/src/addons/pipeline/pipeline.c
@@ -131,7 +131,7 @@ bool flecs_pipeline_check_term(
     (void)world;
 
     ecs_term_ref_t *src = &term->src;
-    if (term->inout == EcsInOutNone || term->inout == EcsInOutFilter) {
+    if (term->inout == EcsInOutFilter) {
         return false;
     }
 

diff --git a/test/addons/project.json b/test/addons/project.json
@@ -113,7 +113,8 @@
                 "pipeline_init_no_system_term",
                 "disable_component_from_immediate_system",
                 "run_w_empty_query",
-                "run_w_0_src_query"
+                "run_w_0_src_query",
+                "inout_none_after_write"
             ]
         }, {
             "id": "SystemMisc",

diff --git a/test/addons/src/Pipeline.c b/test/addons/src/Pipeline.c
@@ -3285,3 +3285,54 @@ void Pipeline_run_w_0_src_query(void) {
 
     ecs_fini(world);
 }
+
+static
+void AddPosition(ecs_iter_t *it) {
+    for (int i = 0; i < it->count; i ++) {
+        ecs_add(it->world, it->entities[i], Position);
+    }
+}
+
+static int check_position_invoked = 0;
+
+static void CheckPosition(ecs_iter_t *it) {
+    for (int i = 0; i < it->count; i ++) {
+        test_assert(ecs_has(it->world, it->entities[i], Position));
+        check_position_invoked ++;
+    }
+}
+
+void Pipeline_inout_none_after_write(void) {
+    ecs_world_t *world = ecs_init();
+
+    ECS_COMPONENT_DEFINE(world, Position);
+    ECS_TAG(world, Foo);
+
+    ecs_system(world, {
+        .entity = ecs_entity(world, {
+            .add = ecs_ids(ecs_pair(EcsDependsOn, EcsOnUpdate))
+        }),
+        .query.terms = {{ Foo }, { ecs_id(Position), .src.id = EcsIsEntity, .inout = EcsOut }},
+        .callback = AddPosition
+    });
+
+    ecs_system(world, {
+        .entity = ecs_entity(world, {
+            .add = ecs_ids(ecs_pair(EcsDependsOn, EcsOnUpdate))
+        }),
+        .query.terms = { { ecs_id(Position), .inout = EcsInOutNone } },
+        .callback = CheckPosition
+    });
+
+    ecs_entity_t e1 = ecs_new_w(world, Foo);
+    ecs_add(world, e1, Position);
+    ecs_entity_t e2 = ecs_new_w(world, Foo);
+
+    ecs_progress(world, 0);
+
+    test_assert(ecs_has(world, e1, Position));
+    test_assert(ecs_has(world, e2, Position));
+    test_int(check_position_invoked, 2);
+
+    ecs_fini(world);
+}
diff --git a/test/addons/src/main.c b/test/addons/src/main.c
@@ -108,6 +108,7 @@ void Pipeline_pipeline_init_no_system_term(void);
 void Pipeline_disable_component_from_immediate_system(void);
 void Pipeline_run_w_empty_query(void);
 void Pipeline_run_w_0_src_query(void);
+void Pipeline_inout_none_after_write(void);
 
 // Testsuite 'SystemMisc'
 void SystemMisc_invalid_not_without_id(void);
@@ -932,6 +933,10 @@ bake_test_case Pipeline_testcases[] = {
     {
         "run_w_0_src_query",
         Pipeline_run_w_0_src_query
+    },
+    {
+        "inout_none_after_write",
+        Pipeline_inout_none_after_write
     }
 };
 
@@ -2560,7 +2565,7 @@ static bake_test_suite suites[] = {
         "Pipeline",
         NULL,
         NULL,
-        85,
+        86,
         Pipeline_testcases
     },
     {

diff --git a/test/core/project.json b/test/core/project.json
@@ -1695,6 +1695,7 @@
                 "forward_up_flag_term_2",
                 "propagate_up_flag_term_1",
                 "propagate_up_flag_term_2",
+                "propagate_on_set_self_up",
                 "row_flag_term_1",
                 "row_flag_term_2",
                 "on_add_optional",