Skip to content

WebGPURenderer: Add debug.getRawShaderAsync(). #28997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 27, 2024
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
34 changes: 19 additions & 15 deletions examples/webgpu_tsl_editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@

import * as THREE from 'three';

import WebGPURenderer from '../src/renderers/webgpu/WebGPURenderer.js';
import WGSLNodeBuilder from '../src/renderers/webgpu/nodes/WGSLNodeBuilder.js';
import GLSLNodeBuilder from '../src/renderers/webgl-fallback/nodes/GLSLNodeBuilder.js';

import { GUI } from 'three/addons/libs/lil-gui.module.min.js';

init();
Expand All @@ -76,7 +72,7 @@

const rendererDOM = document.getElementById( 'renderer' );

const renderer = new WebGPURenderer( { antialias: true } );
const renderer = new THREE.WebGPURenderer( { antialias: true } );
renderer.outputColorSpace = THREE.LinearSRGBColorSpace;
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( 200, 200 );
Expand All @@ -88,8 +84,14 @@
const mesh = new THREE.Mesh( new THREE.PlaneGeometry( 1, 1 ), material );
scene.add( mesh );

//

let compiling = false;

renderer.setAnimationLoop( () => {

if ( compiling ) return;

renderer.render( scene, camera );

} );
Expand All @@ -108,7 +110,7 @@
};

let timeout = null;
let nodeBuilder = null;
let rawShader = null;

const editorDOM = document.getElementById( 'source' );
const resultDOM = document.getElementById( 'result' );
Expand Down Expand Up @@ -158,12 +160,14 @@

const showCode = () => {

result.setValue( nodeBuilder[ options.shader + 'Shader' ] );
result.setValue( rawShader[ options.shader + 'Shader' ] );
result.revealLine( 1 );

};

const build = () => {
const webGLRenderer = new THREE.WebGPURenderer( { forceWebGL: true } );

const build = async () => {

try {

Expand All @@ -173,20 +177,20 @@
mesh.material.fragmentNode = nodes.output;
mesh.material.needsUpdate = true;

let NodeBuilder;
compiling = true;

if ( options.output === 'WGSL' ) {

NodeBuilder = WGSLNodeBuilder;
rawShader = await renderer.debug.getRawShaderAsync( scene, camera, mesh );


} else if ( options.output === 'GLSL ES 3.0' ) {

NodeBuilder = GLSLNodeBuilder;
rawShader = await webGLRenderer.debug.getRawShaderAsync( scene, camera, mesh );

}

nodeBuilder = new NodeBuilder( mesh, renderer );
nodeBuilder.build();
compiling = false;

showCode();

Expand All @@ -195,9 +199,9 @@
/*const style = 'background-color: #333; color: white; font-style: italic; border: 2px solid #777; font-size: 22px;';

console.log( '%c [ WGSL ] Vertex Shader ', style );
console.log( nodeBuilder.vertexShader );
console.log( rawShader.vertexShader );
console.log( '%c [ WGSL ] Fragment Shader ', style );
console.log( nodeBuilder.fragmentShader );*/
console.log( rawShader.fragmentShader );/**/

} catch ( e ) {

Expand Down
2 changes: 2 additions & 0 deletions src/renderers/common/Backend.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ class Backend {

hasFeature( /*name*/ ) { } // return Boolean

getRawShader( /*object*/ ) { } // return { vertexShader, fragmentShader }

getInstanceCount( renderObject ) {

const { object, geometry } = renderObject;
Expand Down
18 changes: 17 additions & 1 deletion src/renderers/common/Renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,23 @@ class Renderer {

this.debug = {
checkShaderErrors: true,
onShaderError: null
onShaderError: null,
getRawShaderAsync: async ( scene, camera, object ) => {

await this.compileAsync( scene, camera );

const renderList = this._renderLists.get( scene, camera );
const renderContext = this._renderContexts.get( scene, camera, this._renderTarget );

const material = scene.overrideMaterial || object.material;

const renderObject = this._objects.get( object, material, scene, camera, renderList.lightsNode, renderContext );

const { fragmentShader, vertexShader } = renderObject.getNodeBuilderState();

return { fragmentShader, vertexShader };

}
};

}
Expand Down
1 change: 0 additions & 1 deletion src/renderers/webgl-fallback/WebGLBackend.js
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,6 @@ class WebGLBackend extends Backend {

}


getMaxAnisotropy() {

return this.capabilities.getMaxAnisotropy();
Expand Down