From d73dc3d7c5bbcd091dc212d5faf3e52c453cd539 Mon Sep 17 00:00:00 2001 From: Christian Helgeson Date: Thu, 22 Aug 2024 09:49:57 -0700 Subject: [PATCH] Implement Renaud suggestions --- src/nodes/Nodes.js | 2 +- ...copedArrayNode.js => WorkgroupInfoNode.js} | 21 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) rename src/nodes/gpgpu/{ScopedArrayNode.js => WorkgroupInfoNode.js} (70%) diff --git a/src/nodes/Nodes.js b/src/nodes/Nodes.js index 0fae468a63e093..fd568e8dbf27c6 100644 --- a/src/nodes/Nodes.js +++ b/src/nodes/Nodes.js @@ -172,7 +172,7 @@ export { default as RangeNode, range } from './geometry/RangeNode.js'; // gpgpu export { default as ComputeNode, compute } from './gpgpu/ComputeNode.js'; -export { default as ScopedArrayNode, workgroupArray, privateArray } from './gpgpu/ScopedArrayNode.js'; +export { default as WorkgroupInfoNode, workgroupArray } from './gpgpu/WorkgroupInfoNode.js'; export { workgroupBarrier, textureBarrier, storageBarrier } from './gpgpu/BarrierNode.js'; // lighting diff --git a/src/nodes/gpgpu/ScopedArrayNode.js b/src/nodes/gpgpu/WorkgroupInfoNode.js similarity index 70% rename from src/nodes/gpgpu/ScopedArrayNode.js rename to src/nodes/gpgpu/WorkgroupInfoNode.js index 2e8113ed8916dd..fabf7acb086852 100644 --- a/src/nodes/gpgpu/ScopedArrayNode.js +++ b/src/nodes/gpgpu/WorkgroupInfoNode.js @@ -2,11 +2,11 @@ import ArrayElementNode from '../utils/ArrayElementNode.js'; import { nodeObject } from '../shadernode/ShaderNode.js'; import Node, { addNodeClass } from '../core/Node.js'; -class ScopedArrayElementNode extends ArrayElementNode { +class WorkgroupInfoElementNode extends ArrayElementNode { - constructor( scopedArrayNode, indexNode ) { + constructor( workgroupInfoNode, indexNode ) { - super( scopedArrayNode, indexNode ); + super( workgroupInfoNode, indexNode ); this.isScopedArrayElementNode = true; @@ -36,7 +36,7 @@ class ScopedArrayElementNode extends ArrayElementNode { } -class ScopedArrayNode extends Node { +class WorkgroupInfoNode extends Node { constructor( scope, bufferType, bufferCount = 0 ) { @@ -45,7 +45,7 @@ class ScopedArrayNode extends Node { this.bufferType = bufferType; this.bufferCount = bufferCount; - this.isScopedArrayNode = true; + this.isWorkgroupInfoNode = true; this.scope = scope; @@ -59,7 +59,7 @@ class ScopedArrayNode extends Node { } - getHash( builder ) { + getHash() { return this.uuid; @@ -81,7 +81,7 @@ class ScopedArrayNode extends Node { element( indexNode ) { - return nodeObject( new ScopedArrayElementNode( this, indexNode ) ); + return nodeObject( new WorkgroupInfoElementNode( this, indexNode ) ); } @@ -93,10 +93,9 @@ class ScopedArrayNode extends Node { } -export default ScopedArrayNode; +export default WorkgroupInfoNode; -export const workgroupArray = ( type, count ) => nodeObject( new ScopedArrayNode( 'Workgroup', type, count ) ); -export const privateArray = ( type, count ) => nodeObject( new ScopedArrayNode( 'Private', type, count ) ); +export const workgroupArray = ( type, count ) => nodeObject( new WorkgroupInfoNode( 'Workgroup', type, count ) ); -addNodeClass( 'ScopedArrayNode', ScopedArrayNode ); +addNodeClass( 'WorkgroupInfoNode', WorkgroupInfoNode );