From acd3e4a38e6a758562d3012e12a2770ee8432bf4 Mon Sep 17 00:00:00 2001 From: sunag Date: Sat, 28 Jun 2025 19:09:13 -0300 Subject: [PATCH 1/2] WebGPURenderer: Restore `isSampledTexture3D` binding check (#31327) --- src/renderers/common/nodes/NodeSampledTexture.js | 2 +- src/renderers/webgpu/utils/WebGPUBindingUtils.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/renderers/common/nodes/NodeSampledTexture.js b/src/renderers/common/nodes/NodeSampledTexture.js index 4d55f76c75fb96..d3bc51ba382a37 100644 --- a/src/renderers/common/nodes/NodeSampledTexture.js +++ b/src/renderers/common/nodes/NodeSampledTexture.js @@ -143,7 +143,7 @@ class NodeSampledTexture3D extends NodeSampledTexture { * @readonly * @default true */ - this.is3DTexture = true; + this.isSampledTexture3D = true; } diff --git a/src/renderers/webgpu/utils/WebGPUBindingUtils.js b/src/renderers/webgpu/utils/WebGPUBindingUtils.js index e846703ca3e18e..270bc17c8e44f7 100644 --- a/src/renderers/webgpu/utils/WebGPUBindingUtils.js +++ b/src/renderers/webgpu/utils/WebGPUBindingUtils.js @@ -216,7 +216,7 @@ class WebGPUBindingUtils { texture.viewDimension = GPUTextureViewDimension.TwoDArray; - } else if ( binding.texture.is3DTexture ) { + } else if ( binding.isSampledTexture3D ) { texture.viewDimension = GPUTextureViewDimension.ThreeD; @@ -438,7 +438,7 @@ class WebGPUBindingUtils { dimensionViewGPU = GPUTextureViewDimension.Cube; - } else if ( binding.texture.is3DTexture ) { + } else if ( binding.isSampledTexture3D ) { dimensionViewGPU = GPUTextureViewDimension.ThreeD; From e9a17272a3d98467f9d848f3bb606bfdf13f64ca Mon Sep 17 00:00:00 2001 From: sunag Date: Sat, 28 Jun 2025 19:11:45 -0300 Subject: [PATCH 2/2] TSLCore: Use `node.nodeType` instead of `safeGetNodeType()` (#31328) --- src/nodes/tsl/TSLCore.js | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/nodes/tsl/TSLCore.js b/src/nodes/tsl/TSLCore.js index 4315d711547f38..7191f91a475b92 100644 --- a/src/nodes/tsl/TSLCore.js +++ b/src/nodes/tsl/TSLCore.js @@ -554,20 +554,6 @@ const getConstNode = ( value, type ) => { }; -const safeGetNodeType = ( node ) => { - - try { - - return node.getNodeType(); - - } catch ( _ ) { - - return undefined; - - } - -}; - const ConvertType = function ( type, cacheMap = null ) { return ( ...params ) => { @@ -587,7 +573,7 @@ const ConvertType = function ( type, cacheMap = null ) { if ( params.length === 1 ) { const node = getConstNode( params[ 0 ], type ); - if ( safeGetNodeType( node ) === type ) return nodeObject( node ); + if ( node.nodeType === type ) return nodeObject( node ); return nodeObject( new ConvertNode( node, type ) ); }