From 9005e6ce08a57d84ebba35ea589f67c260367747 Mon Sep 17 00:00:00 2001 From: ycw Date: Thu, 21 Sep 2023 20:35:27 +0800 Subject: [PATCH 1/3] less var access (#26817) actually use the framebuffer we have cached update examples update screenshots MRT allow example to run fix WGSL code address comments update screenshot --- examples/jsm/nodes/core/OutputStructNode.js | 6 +- examples/jsm/renderers/webgl/WebGLBackend.js | 30 +++++++- .../renderers/webgl/nodes/GLSLNodeBuilder.js | 65 ++++++++++++++++-- .../webgpu_multiple_rendertargets.jpg | Bin 3413 -> 18139 bytes examples/webgpu_multiple_rendertargets.html | 6 +- src/math/Color.js | 6 +- test/e2e/puppeteer.js | 1 - 7 files changed, 99 insertions(+), 15 deletions(-) diff --git a/examples/jsm/nodes/core/OutputStructNode.js b/examples/jsm/nodes/core/OutputStructNode.js index df8991a3ab6c30..68dff8dee7c958 100644 --- a/examples/jsm/nodes/core/OutputStructNode.js +++ b/examples/jsm/nodes/core/OutputStructNode.js @@ -33,15 +33,19 @@ class OutputStructNode extends Node { generate( builder, output ) { const nodeVar = builder.getVarFromNode( this, this.nodeType ); + nodeVar.isOutputStructVar = true; + const propertyName = builder.getPropertyName( nodeVar ); const members = this.members; + const structPrefix = propertyName !== '' ? propertyName + '.' : ''; + for ( let i = 0; i < members.length; i++ ) { const snippet = members[ i ].build( builder, output ); - builder.addLineFlowCode( `${propertyName}.m${i} = ${snippet}` ); + builder.addLineFlowCode( `${structPrefix}m${i} = ${snippet}` ); } diff --git a/examples/jsm/renderers/webgl/WebGLBackend.js b/examples/jsm/renderers/webgl/WebGLBackend.js index dcab743032b1a2..71a995fc08c440 100644 --- a/examples/jsm/renderers/webgl/WebGLBackend.js +++ b/examples/jsm/renderers/webgl/WebGLBackend.js @@ -64,8 +64,26 @@ class WebGLBackend extends Backend { const clearColor = renderContext.clearColorValue; - gl.clearColor( clearColor.r, clearColor.g, clearColor.b, clearColor.a ); - gl.clear( clear ); + if ( clear !== 0 ) { + + if ( renderContext.textures === null ) { + + gl.clearColor( clearColor.r, clearColor.g, clearColor.b, clearColor.a ); + gl.clear( clear ); + + } else { + + for ( let i = 0; i < renderContext.textures.length; i ++ ) { + + gl.clearBufferfv( gl.COLOR, i, [ clearColor.r, clearColor.g, clearColor.b, clearColor.a ] ); + + } + + gl.clearBufferfi( gl.DEPTH_STENCIL, 0, 1, 1 ); + + } + + } // @@ -638,15 +656,23 @@ class WebGLBackend extends Backend { const textures = renderContext.textures; + const drawBuffers = []; + for ( let i = 0; i < textures.length; i++ ) { const texture = textures[ i ]; const { textureGPU } = this.get( texture ); + const attachment = gl.COLOR_ATTACHMENT0 + i; + gl.framebufferTexture2D( gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0 + i, gl.TEXTURE_2D, textureGPU, 0 ); + drawBuffers.push( attachment ); + } + gl.drawBuffers( drawBuffers ); + if ( renderContext.depthTexture !== null ) { const { textureGPU } = this.get( renderContext.depthTexture ); diff --git a/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js b/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js index 311aae9ae95407..192fe6ed075597 100644 --- a/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js +++ b/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js @@ -30,6 +30,14 @@ class GLSLNodeBuilder extends NodeBuilder { } + getPropertyName( node, shaderStage ) { + + if ( node.isOutputStructVar ) return ''; + + return super.getPropertyName( node, shaderStage ); + + } + getTexture( texture, textureProperty, uvSnippet ) { if ( texture.isTextureCube ) { @@ -62,6 +70,8 @@ class GLSLNodeBuilder extends NodeBuilder { for ( const variable of vars ) { + if ( variable.isOutputStructVar ) continue; + snippets.push( `${ this.getVar( variable.type, variable.name ) };` ); } @@ -160,6 +170,50 @@ class GLSLNodeBuilder extends NodeBuilder { } + getStructMembers( struct ) { + + const snippets = []; + const members = struct.getMemberTypes(); + + for ( let i = 0; i < members.length; i ++ ) { + + const member = members[ i ]; + snippets.push( `layout( location = ${i} ) out ${ member} m${i};` ); + + } + + return snippets.join( '\n' ); + + } + + getStructs( shaderStage ) { + + const snippets = []; + const structs = this.structs[ shaderStage ]; + + if ( structs.length === 0 ) { + + return "layout( location = 0 ) out vec4 fragColor;\n"; + + } + + for ( let index = 0, length = structs.length; index < length; index ++ ) { + + const struct = structs[ index ]; + const name = struct.name; + + let snippet = `\n`; + snippet += this.getStructMembers( struct ); + snippet += '\n'; + + snippets.push( snippet ); + + } + + return snippets.join( '\n\n' ); + + } + getVaryings( shaderStage ) { let snippet = ''; @@ -281,7 +335,7 @@ ${shaderData.varyings} // codes ${shaderData.codes} -layout( location = 0 ) out vec4 fragColor; +${shaderData.structs} void main() { @@ -330,15 +384,17 @@ void main() { if ( shaderStage === 'vertex' ) { flow += 'gl_Position = '; + flow += `${ flowSlotData.result };`; } else if ( shaderStage === 'fragment' ) { - flow += 'fragColor = '; + if ( ! node.outputNode.isOutputStructNode ) { + flow += 'fragColor = '; + flow += `${ flowSlotData.result };`; + } } - flow += `${ flowSlotData.result };`; - } } @@ -349,6 +405,7 @@ void main() { stageData.attributes = this.getAttributes( shaderStage ); stageData.varyings = this.getVaryings( shaderStage ); stageData.vars = this.getVars( shaderStage ); + stageData.structs = this.getStructs( shaderStage ); stageData.codes = this.getCodes( shaderStage ); stageData.flow = flow; diff --git a/examples/screenshots/webgpu_multiple_rendertargets.jpg b/examples/screenshots/webgpu_multiple_rendertargets.jpg index 001fe203e0b94e476d12e5c1c76aa979a0fbc77f..e1cd5894893de37cc2c5cfbce14f61ece618652c 100644 GIT binary patch literal 18139 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 delta 46 pcmccJ%Xn34Lp&4nzxo%OCo=tG+&qElKRPja0@GKP{|x_c0s#Mb79aos diff --git a/examples/webgpu_multiple_rendertargets.html b/examples/webgpu_multiple_rendertargets.html index a78c86d5009f4c..f4cacde8828dbb 100644 --- a/examples/webgpu_multiple_rendertargets.html +++ b/examples/webgpu_multiple_rendertargets.html @@ -34,6 +34,8 @@ import { NodeMaterial, MeshBasicNodeMaterial, mix, modelNormalMatrix, normalGeometry, normalize, outputStruct, step, texture, uniform, uv, varying, vec2, vec4 } from 'three/nodes'; import WebGPU from 'three/addons/capabilities/WebGPU.js'; + import WebGL from 'three/addons/capabilities/WebGL.js'; + import WebGPURenderer from 'three/addons/renderers/webgpu/WebGPURenderer.js'; let camera, scene, renderer, torus; @@ -101,11 +103,11 @@ function init() { - if ( WebGPU.isAvailable() === false ) { + if ( WebGPU.isAvailable() === false && WebGL.isWebGL2Available() === false ) { document.body.appendChild( WebGPU.getErrorMessage() ); - throw new Error( 'No WebGPU support' ); + throw new Error( 'No WebGPU or WebGL2 support' ); } diff --git a/src/math/Color.js b/src/math/Color.js index 1056069d575cd9..5f0bad7d438884 100644 --- a/src/math/Color.js +++ b/src/math/Color.js @@ -442,11 +442,7 @@ class Color { this.getHSL( _hslA ); - _hslA.h += h; _hslA.s += s; _hslA.l += l; - - this.setHSL( _hslA.h, _hslA.s, _hslA.l ); - - return this; + return this.setHSL( _hslA.h + h, _hslA.s + s, _hslA.l + l ); } diff --git a/test/e2e/puppeteer.js b/test/e2e/puppeteer.js index 2a5aa6402eb949..4c972cdf41ebe8 100644 --- a/test/e2e/puppeteer.js +++ b/test/e2e/puppeteer.js @@ -125,7 +125,6 @@ const exceptionList = [ 'webgpu_materials', 'webgpu_materials_video', 'webgpu_morphtargets', - "webgpu_multiple_rendertargets", 'webgpu_occlusion', 'webgpu_particles', 'webgpu_sandbox', From 75a4a99d317eaab78c433a2027bcde839070df7f Mon Sep 17 00:00:00 2001 From: aardgoose Date: Thu, 21 Sep 2023 20:12:48 +0100 Subject: [PATCH 2/3] remove unused var --- examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js b/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js index 192fe6ed075597..8b01b58768457a 100644 --- a/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js +++ b/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js @@ -200,7 +200,6 @@ class GLSLNodeBuilder extends NodeBuilder { for ( let index = 0, length = structs.length; index < length; index ++ ) { const struct = structs[ index ]; - const name = struct.name; let snippet = `\n`; snippet += this.getStructMembers( struct ); From 515d4658491b1d3c0f625e6180a618faeccc4b22 Mon Sep 17 00:00:00 2001 From: sunag Date: Fri, 22 Sep 2023 01:17:00 -0300 Subject: [PATCH 3/3] cleanup --- examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js b/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js index 8b01b58768457a..0de36c2ad24a4a 100644 --- a/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js +++ b/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js @@ -388,8 +388,10 @@ void main() { } else if ( shaderStage === 'fragment' ) { if ( ! node.outputNode.isOutputStructNode ) { + flow += 'fragColor = '; flow += `${ flowSlotData.result };`; + } }