Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions dist/preview release/what's new.md
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@
- Fix for triggering interactions on nearby meshes when performing a near interaction grab ([rickfromwork](https://github.com/rickfromwork))
- Fix for near interaction failing when multiple utility layers are present ([rickfromwork](https://github.com/rickfromwork))
- Fix handling of events to support multiple canvas scenarios DeviceInputSystem ([PolygonalSun](https://github.com/PolygonalSun))
- Fix undisposed textures in PrePass effects that would cause the scene to have more textures than expected ([CraigFeldspar](https://github.com/CraigFeldspar))

## Breaking changes

Expand Down
12 changes: 11 additions & 1 deletion src/Materials/Textures/multiRenderTarget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ export class MultiRenderTarget extends RenderTargetTexture {
this._createInternalTextures();

if (forceFullRebuild) {
this._releaseTextures();
this._createTextures();
}

Expand All @@ -224,6 +225,14 @@ export class MultiRenderTarget extends RenderTargetTexture {
this._texture = this._internalTextures[0];
}

private _releaseTextures(): void {
if (this._textures) {
for (let i = 0; i < this._textures.length; i++) {
this._textures[i].dispose();
}
}
}

private _createTextures(): void {
this._textures = [];
for (var i = 0; i < this._internalTextures.length; i++) {
Expand Down Expand Up @@ -308,7 +317,7 @@ export class MultiRenderTarget extends RenderTargetTexture {
*/
public dispose(): void {
this.releaseInternalTextures();

this._releaseTextures();
super.dispose();
}

Expand All @@ -325,6 +334,7 @@ export class MultiRenderTarget extends RenderTargetTexture {
this._internalTextures[i].dispose();
this._internalTextures.splice(i, 1);
}
this._textures[i]._texture = null;
}
}
}
4 changes: 4 additions & 0 deletions src/Materials/Textures/prePassRenderTarget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,5 +127,9 @@ export class PrePassRenderTarget extends MultiRenderTarget {
if (this.imageProcessingPostProcess) {
this.imageProcessingPostProcess.dispose();
}

if (this.renderTargetTexture) {
this.renderTargetTexture._prePassRenderTarget = null;
}
}
}
2 changes: 1 addition & 1 deletion src/Rendering/prePassRendererSceneComponent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ declare module "../abstractScene" {
declare module "../Materials/Textures/renderTargetTexture" {
export interface RenderTargetTexture {
/** @hidden */
_prePassRenderTarget: PrePassRenderTarget;
_prePassRenderTarget: Nullable<PrePassRenderTarget>;
}
}

Expand Down