Skip to content

Fix #12532: Defers batch destruction until next update #12824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+27 −97
Open

Fix #12532: Defers batch destruction until next update #12824

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
26756aa
Defers batch destruction until next update
Aug 19, 2025
e04df47
Defers batch destruction until next update
Aug 20, 2025
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,4 +171,4 @@
}
}
}
}
}
47 changes: 9 additions & 38 deletions packages/engine/Source/DataSources/StaticGeometryColorBatch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,8 @@ function Batch(
this.subscriptions = new AssociativeArray();
this.showsUpdated = new AssociativeArray();
this.itemsToRemove = [];
this.invalidated = false;

let removeMaterialSubscription;
if (defined(depthFailMaterialProperty)) {
removeMaterialSubscription =
depthFailMaterialProperty.definitionChanged.addEventListener(
Batch.prototype.onMaterialChanged,
this,
);
}
this.removeMaterialSubscription = removeMaterialSubscription;
}

Batch.prototype.onMaterialChanged = function () {
this.invalidated = true;
};

Batch.prototype.isMaterial = function (updater) {
const material = this.depthFailMaterialProperty;
const updaterMaterial = updater.depthFailMaterialProperty;
Expand Down Expand Up @@ -391,9 +376,6 @@ Batch.prototype.destroy = function () {
if (defined(oldPrimitive)) {
primitives.remove(oldPrimitive);
}
if (defined(this.removeMaterialSubscription)) {
this.removeMaterialSubscription();
}
};

/**
Expand Down Expand Up @@ -451,12 +433,9 @@ StaticGeometryColorBatch.prototype.add = function (time, updater) {
function removeItem(items, updater) {
const length = items.length;
for (let i = length - 1; i >= 0; i--) {
const item = items[i];
if (item.remove(updater)) {
if (item.updaters.length === 0) {
items.splice(i, 1);
item.destroy();
}
if (items[i].remove(updater)) {
// If the item is now empty, delete it (deferred until the next update,
// in case a new updater is added to the same item first).
return true;
}
}
Expand Down Expand Up @@ -489,26 +468,18 @@ function moveItems(batch, items, time) {
}

function updateItems(batch, items, time, isUpdated) {
let length = items.length;
let i;
for (i = length - 1; i >= 0; i--) {
for (let i = items.length - 1; i >= 0; i--) {
const item = items[i];
if (item.invalidated) {
if (item.updaters.length === 0) {
items.splice(i, 1);
const updaters = item.updaters.values;
const updatersLength = updaters.length;
for (let h = 0; h < updatersLength; h++) {
batch.add(time, updaters[h]);
}
item.destroy();
}
}

length = items.length;
for (i = 0; i < length; ++i) {
isUpdated = items[i].update(time) && isUpdated;
}
return isUpdated;
return items.reduce(
(isUpdated, item) => isUpdated && item.update(time),
isUpdated,
);
}

StaticGeometryColorBatch.prototype.update = function (time) {
Expand Down
39 changes: 9 additions & 30 deletions packages/engine/Source/DataSources/StaticGeometryPerMaterialBatch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,10 @@ function Batch(
this.depthFailMaterial = undefined;
this.updatersWithAttributes = new AssociativeArray();
this.attributes = new AssociativeArray();
this.invalidated = false;
this.removeMaterialSubscription =
materialProperty.definitionChanged.addEventListener(
Batch.prototype.onMaterialChanged,
this,
);
this.subscriptions = new AssociativeArray();
this.showsUpdated = new AssociativeArray();
}

Batch.prototype.onMaterialChanged = function () {
this.invalidated = true;
};

Batch.prototype.isMaterial = function (updater) {
const material = this.materialProperty;
const updaterMaterial = updater.fillMaterialProperty;
Expand Down Expand Up @@ -378,7 +368,6 @@ Batch.prototype.destroy = function () {
if (defined(oldPrimitive)) {
primitives.remove(oldPrimitive);
}
this.removeMaterialSubscription();
};

/**
Expand Down Expand Up @@ -426,40 +415,30 @@ StaticGeometryPerMaterialBatch.prototype.remove = function (updater) {
const items = this._items;
const length = items.length;
for (let i = length - 1; i >= 0; i--) {
const item = items[i];
if (item.remove(updater)) {
if (item.updaters.length === 0) {
items.splice(i, 1);
item.destroy();
}
if (items[i].remove(updater)) {
// If the item is now empty, delete it (deferred until the next update,
// in case a new updater is added to the same item first).
break;
}
}
};

StaticGeometryPerMaterialBatch.prototype.update = function (time) {
let i;
const items = this._items;
const length = items.length;

for (i = length - 1; i >= 0; i--) {
for (let i = length - 1; i >= 0; i--) {
const item = items[i];
if (item.invalidated) {
if (item.updaters.length === 0) {
items.splice(i, 1);
const updaters = item.updaters.values;
const updatersLength = updaters.length;
for (let h = 0; h < updatersLength; h++) {
this.add(time, updaters[h]);
}
item.destroy();
}
}

let isUpdated = true;
for (i = 0; i < items.length; i++) {
isUpdated = items[i].update(time) && isUpdated;
}
return isUpdated;
return items.reduce(
(isUpdated, item) => isUpdated && item.update(time),
false,
);
};

StaticGeometryPerMaterialBatch.prototype.getBoundingSphere = function (
Expand Down
36 changes: 8 additions & 28 deletions packages/engine/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,13 @@ function Batch(
this.material = undefined;
this.updatersWithAttributes = new AssociativeArray();
this.attributes = new AssociativeArray();
this.invalidated = false;
this.removeMaterialSubscription =
materialProperty.definitionChanged.addEventListener(
Batch.prototype.onMaterialChanged,
this,
);
this.subscriptions = new AssociativeArray();
this.showsUpdated = new AssociativeArray();
this.zIndex = zIndex;

this._asynchronous = asynchronous;
}

Batch.prototype.onMaterialChanged = function () {
this.invalidated = true;
};

// Check if the given updater's material is compatible with this batch
Batch.prototype.isMaterial = function (updater) {
const material = this.materialProperty;
Expand Down Expand Up @@ -325,7 +315,6 @@ Batch.prototype.destroy = function () {
if (defined(oldPrimitive)) {
orderedGroundPrimitives.remove(oldPrimitive);
}
this.removeMaterialSubscription();
};

/**
Expand Down Expand Up @@ -371,12 +360,9 @@ StaticGroundPolylinePerMaterialBatch.prototype.remove = function (updater) {
const items = this._items;
const length = items.length;
for (let i = length - 1; i >= 0; i--) {
const item = items[i];
if (item.remove(updater)) {
if (item.updaters.length === 0) {
items.splice(i, 1);
item.destroy();
}
if (items[i].remove(updater)) {
// If the item is now empty, delete it (deferred until the next update,
// in case a new updater is added to the same item first).
break;
}
}
Expand All @@ -389,22 +375,16 @@ StaticGroundPolylinePerMaterialBatch.prototype.update = function (time) {

for (i = length - 1; i >= 0; i--) {
const item = items[i];
if (item.invalidated) {
if (item.updaters.length === 0) {
items.splice(i, 1);
const updaters = item.updaters.values;
const updatersLength = updaters.length;
for (let h = 0; h < updatersLength; h++) {
this.add(time, updaters[h]);
}
item.destroy();
}
}

let isUpdated = true;
for (i = 0; i < items.length; i++) {
isUpdated = items[i].update(time) && isUpdated;
}
return isUpdated;
return items.reduce(
(isUpdated, item) => isUpdated && item.update(time),
false,
);
};

StaticGroundPolylinePerMaterialBatch.prototype.getBoundingSphere = function (
Expand Down