瀏覽代碼

WebGPUBindings: More clean up. (#21780)

Michael Herzog 4 年之前
父節點
當前提交
c256f41e11

+ 8 - 4
examples/jsm/renderers/webgpu/WebGPUBindings.js

@@ -30,9 +30,9 @@ class WebGPUBindings {
 
 
 			// setup (static) binding layout and (dynamic) binding group
 			// setup (static) binding layout and (dynamic) binding group
 
 
-			const renderPipelines = this.renderPipelines.get( object );
+			const renderPipeline = this.renderPipelines.get( object );
 
 
-			const bindLayout = renderPipelines.pipeline.getBindGroupLayout( 0 );
+			const bindLayout = renderPipeline.pipeline.getBindGroupLayout( 0 );
 			const bindGroup = this._createBindGroup( bindings, bindLayout );
 			const bindGroup = this._createBindGroup( bindings, bindLayout );
 
 
 			data = {
 			data = {
@@ -55,9 +55,13 @@ class WebGPUBindings {
 
 
 		if ( data === undefined ) {
 		if ( data === undefined ) {
 
 
-			const pipeline = this.computePipelines.get( param );
+			// bindings are not yet retrieved via node material
+
 			const bindings = param.bindings !== undefined ? param.bindings.slice() : [];
 			const bindings = param.bindings !== undefined ? param.bindings.slice() : [];
-			const bindLayout = pipeline.getBindGroupLayout( 0 );
+
+			const computePipeline = this.computePipelines.get( param );
+
+			const bindLayout = computePipeline.getBindGroupLayout( 0 );
 			const bindGroup = this._createBindGroup( bindings, bindLayout );
 			const bindGroup = this._createBindGroup( bindings, bindLayout );
 
 
 			data = {
 			data = {

+ 1 - 1
examples/jsm/renderers/webgpu/WebGPUComputePipelines.js

@@ -18,7 +18,7 @@ class WebGPUComputePipelines {
 
 
 		let pipeline = this.pipelines.get( param );
 		let pipeline = this.pipelines.get( param );
 
 
-		// @TODO: Reuse compute pipeline if possible
+		// @TODO: Reuse compute pipeline if possible, introduce WebGPUComputePipeline
 
 
 		if ( pipeline === undefined ) {
 		if ( pipeline === undefined ) {