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
46 changes: 33 additions & 13 deletions src/renderers/common/nodes/Nodes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import DataMap from '../DataMap.js';
import ChainMap from '../ChainMap.js';
import NodeBuilderState from './NodeBuilderState.js';
import NodeMaterial from '../../../materials/nodes/NodeMaterial.js';
import { cubeMapNode } from '../../../nodes/utils/CubeMapNode.js';
import { NodeFrame } from '../../../nodes/Nodes.js';
import { objectGroup, renderGroup, frameGroup, cubeTexture, texture, texture3D, vec3, fog, rangeFogFactor, densityFogFactor, reference, pmremTexture, screenUV } from '../../../nodes/TSL.js';
Expand Down Expand Up @@ -194,22 +195,41 @@ class Nodes extends DataMap {

if ( nodeBuilderState === undefined ) {

const nodeBuilder = this.backend.createNodeBuilder( renderObject.object, this.renderer );
nodeBuilder.scene = renderObject.scene;
nodeBuilder.material = renderObject.material;
nodeBuilder.camera = renderObject.camera;
nodeBuilder.context.material = renderObject.material;
nodeBuilder.lightsNode = renderObject.lightsNode;
nodeBuilder.environmentNode = this.getEnvironmentNode( renderObject.scene );
nodeBuilder.fogNode = this.getFogNode( renderObject.scene );
nodeBuilder.clippingContext = renderObject.clippingContext;
if ( this.renderer.getOutputRenderTarget() ? this.renderer.getOutputRenderTarget().multiview : false ) {
const createNodeBuilder = ( material ) => {

nodeBuilder.enableMultiview();
const nodeBuilder = this.backend.createNodeBuilder( renderObject.object, this.renderer );
nodeBuilder.scene = renderObject.scene;
nodeBuilder.material = material;
nodeBuilder.camera = renderObject.camera;
nodeBuilder.context.material = material;
nodeBuilder.lightsNode = renderObject.lightsNode;
nodeBuilder.environmentNode = this.getEnvironmentNode( renderObject.scene );
nodeBuilder.fogNode = this.getFogNode( renderObject.scene );
nodeBuilder.clippingContext = renderObject.clippingContext;
if ( this.renderer.getOutputRenderTarget() ? this.renderer.getOutputRenderTarget().multiview : false ) {

}
nodeBuilder.enableMultiview();

}

return nodeBuilder;

};

let nodeBuilder = createNodeBuilder( renderObject.material );

nodeBuilder.build();
try {

nodeBuilder.build();

} catch ( e ) {

nodeBuilder = createNodeBuilder( new NodeMaterial() );
nodeBuilder.build();

error( 'TSL: ' + e );

}

nodeBuilderState = this._createNodeBuilderState( nodeBuilder );

Expand Down
5 changes: 4 additions & 1 deletion src/renderers/webgpu/WebGPUBackend.js
Original file line number Diff line number Diff line change
Expand Up @@ -1461,7 +1461,10 @@ class WebGPUBackend extends Backend {
const { object, material, context, pipeline } = renderObject;
const bindings = renderObject.getBindings();
const renderContextData = this.get( context );
const pipelineGPU = this.get( pipeline ).pipeline;
const pipelineData = this.get( pipeline );
const pipelineGPU = pipelineData.pipeline;

if ( pipelineData.error === true ) return;

const index = renderObject.getIndex();
const hasIndex = ( index !== null );
Expand Down
37 changes: 32 additions & 5 deletions src/renderers/webgpu/utils/WebGPUPipelineUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
KeepStencilOp, ZeroStencilOp, ReplaceStencilOp, InvertStencilOp, IncrementStencilOp, DecrementStencilOp, IncrementWrapStencilOp, DecrementWrapStencilOp,
NeverStencilFunc, AlwaysStencilFunc, LessStencilFunc, LessEqualStencilFunc, EqualStencilFunc, GreaterEqualStencilFunc, GreaterStencilFunc, NotEqualStencilFunc
} from '../../../constants.js';

import { error } from '../../../utils.js';

/**
Expand Down Expand Up @@ -230,21 +231,47 @@ class WebGPUPipelineUtils {

}

// create pipeline

device.pushErrorScope( 'validation' );

if ( promises === null ) {

pipelineData.pipeline = device.createRenderPipeline( pipelineDescriptor );

device.popErrorScope().then( ( err ) => {

if ( err !== null ) {

pipelineData.error = true;

error( err.message );

}

} );

} else {

const p = new Promise( ( resolve /*, reject*/ ) => {
const p = new Promise( async ( resolve /*, reject*/ ) => {

device.createRenderPipelineAsync( pipelineDescriptor ).then( pipeline => {
try {

pipelineData.pipeline = pipeline;
resolve();
pipelineData.pipeline = await device.createRenderPipelineAsync( pipelineDescriptor );

} );
} catch ( err ) { }

const errorScope = await device.popErrorScope();

if ( errorScope !== null ) {

pipelineData.error = true;

error( errorScope.message );

}

resolve();

} );

Expand Down