#841 fix issue with page/worker iterators and InOutNone

Author: SanderMertens

flecs.c

@@ -51296,24 +51296,27 @@ ecs_iter_t ecs_page_iter(
 }
 
 static
-void offset_iter(
+void flecs_offset_iter(
     ecs_iter_t *it,
     int32_t offset)
 {
     it->entities = &it->entities[offset];
 
     int32_t t, field_count = it->field_count;
-    for (t = 0; t < field_count; t ++) {
-        void *ptrs = it->ptrs[t];
-        if (!ptrs) {
-            continue;
-        }
+    void **it_ptrs = it->ptrs;
+    if (it_ptrs) {
+        for (t = 0; t < field_count; t ++) {
+            void *ptrs = it_ptrs[t];
+            if (!ptrs) {
+                continue;
+            }
 
-        if (it->sources[t]) {
-            continue;
-        }
+            if (it->sources[t]) {
+                continue;
+            }
 
-        it->ptrs[t] = ECS_OFFSET(ptrs, offset * it->sizes[t]);
+            it->ptrs[t] = ECS_OFFSET(ptrs, offset * it->sizes[t]);
+        }
     }
 }
 
@@ -51368,7 +51371,7 @@ bool ecs_page_next_instanced(
                 it->offset += offset;
                 count = it->count -= offset;
                 iter->offset = 0;
-                offset_iter(it, offset);
+                flecs_offset_iter(it, offset);
             }
         }
 
@@ -51498,7 +51501,7 @@ bool ecs_worker_next_instanced(
     it->instance_count = instances_per_worker;
     it->frame_offset += first;
 
-    offset_iter(it, it->offset + first);
+    flecs_offset_iter(it, it->offset + first);
     it->count = per_worker;
 
     if (ECS_BIT_IS_SET(it->flags, EcsIterIsInstanced)) {

flecs.h

@@ -23618,7 +23618,7 @@ struct observer_builder_i : filter_builder_i<Base, Components ...> {
     Base& ctx(void *ptr) {
         m_desc->ctx = ptr;
         return *this;
-    }    
+    }
 
     /** Set observer run callback */
     Base& run(ecs_iter_action_t action) {

src/iter.c

@@ -928,24 +928,27 @@ ecs_iter_t ecs_page_iter(
 }
 
 static
-void offset_iter(
+void flecs_offset_iter(
     ecs_iter_t *it,
     int32_t offset)
 {
     it->entities = &it->entities[offset];
 
     int32_t t, field_count = it->field_count;
-    for (t = 0; t < field_count; t ++) {
-        void *ptrs = it->ptrs[t];
-        if (!ptrs) {
-            continue;
-        }
+    void **it_ptrs = it->ptrs;
+    if (it_ptrs) {
+        for (t = 0; t < field_count; t ++) {
+            void *ptrs = it_ptrs[t];
+            if (!ptrs) {
+                continue;
+            }
 
-        if (it->sources[t]) {
-            continue;
-        }
+            if (it->sources[t]) {
+                continue;
+            }
 
-        it->ptrs[t] = ECS_OFFSET(ptrs, offset * it->sizes[t]);
+            it->ptrs[t] = ECS_OFFSET(ptrs, offset * it->sizes[t]);
+        }
     }
 }
 
@@ -1000,7 +1003,7 @@ bool ecs_page_next_instanced(
                 it->offset += offset;
                 count = it->count -= offset;
                 iter->offset = 0;
-                offset_iter(it, offset);
+                flecs_offset_iter(it, offset);
             }
         }
 
@@ -1130,7 +1133,7 @@ bool ecs_worker_next_instanced(
     it->instance_count = instances_per_worker;
     it->frame_offset += first;
 
-    offset_iter(it, it->offset + first);
+    flecs_offset_iter(it, it->offset + first);
     it->count = per_worker;
 
     if (ECS_BIT_IS_SET(it->flags, EcsIterIsInstanced)) {

test/api/project.json

@@ -1436,7 +1436,11 @@
                 "count",
                 "iter_restore_stack_iter",
                 "interleaved_iter",
-                "get_first"
+                "get_first",
+                "page_iter_w_only_tag",
+                "worker_iter_w_only_tag",
+                "page_iter_w_inout_none",
+                "worker_iter_w_inout_none"
             ]
         }, {
             "id": "Pairs",

test/api/src/Iter.c

@@ -1736,3 +1736,103 @@ void Iter_get_first() {
 
     ecs_fini(world);
 }
+
+void Iter_page_iter_w_only_tag() {
+    ecs_world_t *world = ecs_mini();
+
+    ECS_TAG(world, Tag);
+
+    ecs_filter_t *f = ecs_filter(world, {
+        .terms = {{ Tag }}
+    });
+    
+    ecs_new(world, Tag);
+    ecs_entity_t e2 = ecs_new(world, Tag);
+
+    ecs_iter_t it = ecs_filter_iter(world, f);
+    ecs_iter_t pit = ecs_page_iter(&it, 1, 0);
+
+    test_assert(ecs_page_next(&pit));
+    test_int(pit.count, 1);
+    test_uint(pit.entities[0], e2);
+    test_assert(!ecs_page_next(&pit));
+
+    ecs_filter_fini(f);
+
+    ecs_fini(world);
+}
+
+void Iter_worker_iter_w_only_tag() {
+    ecs_world_t *world = ecs_mini();
+
+    ECS_TAG(world, Tag);
+
+    ecs_filter_t *f = ecs_filter(world, {
+        .terms = {{ Tag }}
+    });
+    
+    ecs_new(world, Tag);
+    ecs_entity_t e2 = ecs_new(world, Tag);
+
+    ecs_iter_t it = ecs_filter_iter(world, f);
+    ecs_iter_t pit = ecs_worker_iter(&it, 1, 2);
+
+    test_assert(ecs_worker_next(&pit));
+    test_int(pit.count, 1);
+    test_uint(pit.entities[0], e2);
+    test_assert(!ecs_worker_next(&pit));
+
+    ecs_filter_fini(f);
+
+    ecs_fini(world);
+}
+
+void Iter_page_iter_w_inout_none() {
+    ecs_world_t *world = ecs_mini();
+
+    ECS_COMPONENT(world, Position);
+
+    ecs_filter_t *f = ecs_filter(world, {
+        .terms = {{ ecs_id(Position), .inout = EcsInOutNone }}
+    });
+    
+    ecs_new(world, Position);
+    ecs_entity_t e2 = ecs_new(world, Position);
+
+    ecs_iter_t it = ecs_filter_iter(world, f);
+    ecs_iter_t pit = ecs_page_iter(&it, 1, 0);
+
+    test_assert(ecs_page_next(&pit));
+    test_int(pit.count, 1);
+    test_uint(pit.entities[0], e2);
+    test_assert(!ecs_page_next(&pit));
+
+    ecs_filter_fini(f);
+
+    ecs_fini(world);
+}
+
+void Iter_worker_iter_w_inout_none() {
+    ecs_world_t *world = ecs_mini();
+
+    ECS_COMPONENT(world, Position);
+
+    ecs_filter_t *f = ecs_filter(world, {
+        .terms = {{ ecs_id(Position), .inout = EcsInOutNone }}
+    });
+    
+    ecs_new(world, Position);
+    ecs_entity_t e2 = ecs_new(world, Position);
+
+    ecs_iter_t it = ecs_filter_iter(world, f);
+    ecs_iter_t pit = ecs_worker_iter(&it, 1, 2);
+
+    test_assert(ecs_worker_next(&pit));
+    test_int(pit.count, 1);
+    test_uint(pit.entities[0], e2);
+    test_assert(!ecs_worker_next(&pit));
+
+    ecs_filter_fini(f);
+
+    ecs_fini(world);
+}

test/api/src/main.c

@@ -1374,6 +1374,10 @@ void Iter_count(void);
 void Iter_iter_restore_stack_iter(void);
 void Iter_interleaved_iter(void);
 void Iter_get_first(void);
+void Iter_page_iter_w_only_tag(void);
+void Iter_worker_iter_w_only_tag(void);
+void Iter_page_iter_w_inout_none(void);
+void Iter_worker_iter_w_inout_none(void);
 
 // Testsuite 'Pairs'
 void Pairs_type_w_one_pair(void);
@@ -7518,6 +7522,22 @@ bake_test_case Iter_testcases[] = {
     {
         "get_first",
         Iter_get_first
+    },
+    {
+        "page_iter_w_only_tag",
+        Iter_page_iter_w_only_tag
+    },
+    {
+        "worker_iter_w_only_tag",
+        Iter_worker_iter_w_only_tag
+    },
+    {
+        "page_iter_w_inout_none",
+        Iter_page_iter_w_inout_none
+    },
+    {
+        "worker_iter_w_inout_none",
+        Iter_worker_iter_w_inout_none
     }
 };
 
@@ -11031,7 +11051,7 @@ static bake_test_suite suites[] = {
         "Iter",
         NULL,
         NULL,
-        28,
+        32,
         Iter_testcases
     },
     {