Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[pull] dev from mrdoob:dev #604

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.

Sign up for GitHub

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
Jun 22, 2025
Merged

[pull] dev from mrdoob:dev #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1d24bd
TSL Transpiler: Add simplified `Fn()` layout (#31299)
sunag Jun 21, 2025
45bc878
Examples: Remove deprecated property of `webgpu_shadertoy`
sunag Jun 22, 2025
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
10 changes: 9 additions & 1 deletion examples/jsm/transpiler/GLSLDecoder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ const unaryOperators = [
'+', '-', '~', '!', '++', '--'
];

const arithmeticOperators = [
'*', '/', '%', '+', '-', '<<', '>>'
];

const precedenceOperators = [
'*', '/', '%',
'-', '+',
Expand Down Expand Up @@ -328,7 +332,11 @@ class GLSLDecoder {
if ( ! token.isOperator || i === 0 || i === tokens.length - 1 ) return;

// important for negate operator after arithmetic operator: a * -1, a * -( b )
if ( ( inverse && tokens[ i - 1 ].isOperator ) || ( ! inverse && tokens[ i + 1 ].isOperator ) ) return;
if ( ( inverse && arithmeticOperators.includes( tokens[ i - 1 ].str ) ) || ( ! inverse && arithmeticOperators.includes( tokens[ i + 1 ].str ) ) ) {

return;

}

if ( groupIndex === 0 && token.str === operator ) {

Expand Down
21 changes: 4 additions & 17 deletions examples/jsm/transpiler/TSLEncoder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ class TSLEncoder {
this.global = new Set();
this.overloadings = new Map();
this.iife = false;
this.uniqueNames = false;
this.reference = false;

this._currentVariable = null;
Expand Down Expand Up @@ -726,8 +725,6 @@ ${ this.tab }} )`;

for ( const param of node.params ) {

let str = `{ name: '${ param.name }', type: '${ param.type }'`;

let name = param.name;

if ( param.immutable === false && ( param.qualifier !== 'inout' && param.qualifier !== 'out' ) ) {
Expand All @@ -746,11 +743,9 @@ ${ this.tab }} )`;

}

str += ', qualifier: \'' + param.qualifier + '\'';

}

inputs.push( str + ' }' );
inputs.push( param.name + ': \'' + param.type + '\'' );
params.push( name );

this._currentProperties[ name ] = param;
Expand Down Expand Up @@ -795,23 +790,15 @@ ${ this.tab }} )`;

${ bodyStr }

${ this.tab }} )`;

const layoutInput = inputs.length > 0 ? '\n\t\t' + this.tab + inputs.join( ',\n\t\t' + this.tab ) + '\n\t' + this.tab : '';
${ this.tab }}`;

if ( node.layout !== false && hasPointer === false ) {

const uniqueName = this.uniqueNames ? fnName + '_' + Math.random().toString( 36 ).slice( 2 ) : fnName;

funcStr += `.setLayout( {
${ this.tab }\tname: '${ uniqueName }',
${ this.tab }\ttype: '${ type }',
${ this.tab }\tinputs: [${ layoutInput }]
${ this.tab }} )`;
funcStr += ', { ' + inputs.join( ', ' ) + ', return: \'' + type + '\' }';

}

funcStr += ';\n';
funcStr += ' );\n';

this.imports.add( 'Fn' );

Expand Down
1 change: 0 additions & 1 deletion examples/webgpu_shadertoy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@

const encoder = new TSLEncoder();
encoder.iife = iife;
encoder.uniqueNames = true;

const jsCode = new Transpiler( decoder, encoder ).parse( glsl );

Expand Down