Skip to content

Auto-populate is2DArray/depth in wrapNativeTexture from native layer count #18535

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

Merged
bghgary merged 7 commits into from
Jun 17, 2026
Merged

Auto-populate is2DArray/depth in wrapNativeTexture from native layer count #18535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a08fa49
Auto-populate is2DArray/depth in wrapNativeTexture from layer count
bghgary Jun 2, 2026
3859175
Make getTextureLayerCount usage backward-compatible
bghgary Jun 4, 2026
dbd6658
Use truthy check instead of typeof for getTextureLayerCount presence
bghgary Jun 4, 2026
f4f9e19
Set baseDepth on wrapped 2D-array textures and collapse long throw
bghgary Jun 16, 2026
961b419
Drop redundant JSDoc on getTextureLayerCount
bghgary Jun 16, 2026
e972473
Merge remote-tracking branch 'origin/master' into bghgary/wrap-native…
bghgary Jun 17, 2026
ffad9e4
Re-trigger CI (transient npm ECONNRESET on prior run)
bghgary Jun 17, 2026
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 packages/dev/core/src/Engines/Native/nativeInterfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export interface INativeEngine {
loadCubeTextureWithMips(texture: NativeTexture, data: Array<Array<ArrayBufferView>>, invertY: boolean, srgb: boolean, onSuccess: () => void, onError: () => void): void;
getTextureWidth(texture: NativeTexture): number;
getTextureHeight(texture: NativeTexture): number;
getTextureLayerCount?(texture: NativeTexture): number;
deleteTexture(texture: NativeTexture): void;
readTexture(
texture: NativeTexture,
Expand Down
14 changes: 14 additions & 0 deletions packages/dev/core/src/Engines/thinNativeEngine.pure.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2035,6 +2035,13 @@ export class ThinNativeEngine extends ThinEngine {
internalTexture.baseHeight = this._engine.getTextureHeight(texture);
internalTexture.width = internalTexture.baseWidth;
internalTexture.height = internalTexture.baseHeight;
if (this._engine.getTextureLayerCount) {
const layerCount = this._engine.getTextureLayerCount(texture);
if (layerCount > 1) {
internalTexture.is2DArray = true;
internalTexture.baseDepth = internalTexture.depth = layerCount;
}
}
internalTexture.isReady = true;
internalTexture.useMipMaps = hasMipMaps;
this.updateTextureSamplingMode(samplingMode, internalTexture);
Expand Down Expand Up @@ -2073,6 +2080,13 @@ export class ThinNativeEngine extends ThinEngine {
`updateWrappedNativeTexture: new handle dimensions (${newWidth}x${newHeight}) must match the wrapped texture's dimensions (${internalTexture.baseWidth}x${internalTexture.baseHeight}).`
);
}
if (this._engine.getTextureLayerCount) {
const newLayerCount = this._engine.getTextureLayerCount(texture);
const oldLayerCount = internalTexture.is2DArray ? internalTexture.depth : 1;
if (newLayerCount !== oldLayerCount) {
throw new Error(`updateWrappedNativeTexture: new handle layer count (${newLayerCount}) must match the wrapped texture's layer count (${oldLayerCount}).`);
}
}

// Pre-validate before mutating any state so a thrown precondition leaves the InternalTexture untouched.
// Note: rtWrapper.texture only returns _textures[0]; walk every attachment to catch the multi-RT case where
Expand Down
Loading