Skip to content

Commit e42c0ea

Browse files
committed
[pipelines] Remove unused iters and iter_count members from pipeline state
1 parent 6653b01 commit e42c0ea

5 files changed

Lines changed: 0 additions & 24 deletions

File tree

distr/flecs.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28150,8 +28150,6 @@ struct ecs_pipeline_state_t {
2815028150
ecs_entity_t last_system; /* Last system run by pipeline */
2815128151
int32_t match_count; /* Used to track if rebuild is necessary */
2815228152
int32_t rebuild_count; /* Number of pipeline rebuilds */
28153-
ecs_iter_t *iters; /* Iterator for worker(s) */
28154-
int32_t iter_count;
2815528153

2815628154
/* Members for continuing pipeline iteration after pipeline rebuild */
2815728155
ecs_pipeline_op_t *cur_op; /* Current pipeline op */
@@ -62670,7 +62668,6 @@ static void flecs_pipeline_state_free(
6267062668
ecs_allocator_t *a = &world->allocator;
6267162669
ecs_vec_fini_t(a, &p->ops, ecs_pipeline_op_t);
6267262670
ecs_vec_fini_t(a, &p->systems, ecs_system_t*);
62673-
ecs_os_free(p->iters);
6267462671
ecs_os_free(p);
6267562672
}
6267662673
}
@@ -63162,12 +63159,6 @@ bool flecs_pipeline_update(
6316263159

6316363160
bool rebuilt = flecs_pipeline_build(world, pq);
6316463161
if (start_of_frame) {
63165-
/* Initialize iterators */
63166-
int32_t i, count = pq->iter_count;
63167-
for (i = 0; i < count; i ++) {
63168-
ecs_world_t *stage = ecs_get_stage(world, i);
63169-
pq->iters[i] = ecs_query_iter(stage, pq->query);
63170-
}
6317163162
pq->cur_op = ecs_vec_first_t(&pq->ops, ecs_pipeline_op_t);
6317263163
pq->cur_i = 0;
6317363164
} else {
@@ -74939,8 +74930,6 @@ void flecs_pipeline_memory_get(
7493974930
ECS_SIZEOF(ecs_pipeline_op_t);
7494074931
result->bytes_pipelines += ecs_vec_size(&ps->systems) *
7494174932
ECS_SIZEOF(ecs_entity_t);
74942-
result->bytes_pipelines += ps->iter_count *
74943-
ECS_SIZEOF(ecs_iter_t);
7494474933
}
7494574934
}
7494674935
}

distr/flecs_no_addons.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23907,8 +23907,6 @@ struct ecs_pipeline_state_t {
2390723907
ecs_entity_t last_system; /* Last system run by pipeline */
2390823908
int32_t match_count; /* Used to track if rebuild is necessary */
2390923909
int32_t rebuild_count; /* Number of pipeline rebuilds */
23910-
ecs_iter_t *iters; /* Iterator for worker(s) */
23911-
int32_t iter_count;
2391223910

2391323911
/* Members for continuing pipeline iteration after pipeline rebuild */
2391423912
ecs_pipeline_op_t *cur_op; /* Current pipeline op */

src/addons/pipeline/pipeline.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ static void flecs_pipeline_state_free(
1919
ecs_allocator_t *a = &world->allocator;
2020
ecs_vec_fini_t(a, &p->ops, ecs_pipeline_op_t);
2121
ecs_vec_fini_t(a, &p->systems, ecs_system_t*);
22-
ecs_os_free(p->iters);
2322
ecs_os_free(p);
2423
}
2524
}
@@ -511,12 +510,6 @@ bool flecs_pipeline_update(
511510

512511
bool rebuilt = flecs_pipeline_build(world, pq);
513512
if (start_of_frame) {
514-
/* Initialize iterators */
515-
int32_t i, count = pq->iter_count;
516-
for (i = 0; i < count; i ++) {
517-
ecs_world_t *stage = ecs_get_stage(world, i);
518-
pq->iters[i] = ecs_query_iter(stage, pq->query);
519-
}
520513
pq->cur_op = ecs_vec_first_t(&pq->ops, ecs_pipeline_op_t);
521514
pq->cur_i = 0;
522515
} else {

src/addons/pipeline/pipeline.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ struct ecs_pipeline_state_t {
2727
ecs_entity_t last_system; /* Last system run by pipeline */
2828
int32_t match_count; /* Used to track if rebuild is necessary */
2929
int32_t rebuild_count; /* Number of pipeline rebuilds */
30-
ecs_iter_t *iters; /* Iterator for worker(s) */
31-
int32_t iter_count;
3230

3331
/* Members for continuing pipeline iteration after pipeline rebuild */
3432
ecs_pipeline_op_t *cur_op; /* Current pipeline op */

src/addons/stats/memory.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -791,8 +791,6 @@ void flecs_pipeline_memory_get(
791791
ECS_SIZEOF(ecs_pipeline_op_t);
792792
result->bytes_pipelines += ecs_vec_size(&ps->systems) *
793793
ECS_SIZEOF(ecs_entity_t);
794-
result->bytes_pipelines += ps->iter_count *
795-
ECS_SIZEOF(ecs_iter_t);
796794
}
797795
}
798796
}

0 commit comments

Comments
 (0)