Skip to content

WGSLNodeBuilder: Fix use of sampler for vertex stage #31052

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
sunag merged 1 commit into from
May 5, 2025
Merged

WGSLNodeBuilder: Fix use of sampler for vertex stage #31052

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 7 additions & 12 deletions src/renderers/webgpu/nodes/WGSLNodeBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,9 @@ class WGSLNodeBuilder extends NodeBuilder {

}

} else if ( this.isFilteredTexture( texture ) ) {

return this.generateFilteredTexture( texture, textureProperty, uvSnippet );

} else {

return this.generateTextureLod( texture, textureProperty, uvSnippet, depthSnippet, '0' );
return this._generateTextureSampleLevel( texture, textureProperty, uvSnippet, '0', depthSnippet );

}

Expand Down Expand Up @@ -291,13 +287,12 @@ class WGSLNodeBuilder extends NodeBuilder {
* @param {string} textureProperty - The name of the texture uniform in the shader.
* @param {string} uvSnippet - A WGSL snippet that represents texture coordinates used for sampling.
* @param {string} levelSnippet - A WGSL snippet that represents the mip level, with level 0 containing a full size version of the texture.
* @param {?string} depthSnippet - A WGSL snippet that represents 0-based texture array index to sample.
* @param {string} [shaderStage=this.shaderStage] - The shader stage this code snippet is generated for.
* @param {string} depthSnippet - A WGSL snippet that represents 0-based texture array index to sample.
* @return {string} The WGSL snippet.
*/
_generateTextureSampleLevel( texture, textureProperty, uvSnippet, levelSnippet, depthSnippet, shaderStage = this.shaderStage ) {
_generateTextureSampleLevel( texture, textureProperty, uvSnippet, levelSnippet, depthSnippet ) {

if ( ( shaderStage === 'fragment' || shaderStage === 'compute' ) && this.isUnfilterable( texture ) === false ) {
if ( this.isUnfilterable( texture ) === false ) {

return `textureSampleLevel( ${ textureProperty }, ${ textureProperty }_sampler, ${ uvSnippet }, ${ levelSnippet } )`;

Expand Down Expand Up @@ -726,7 +721,7 @@ class WGSLNodeBuilder extends NodeBuilder {

} else {

snippet = this._generateTextureSampleLevel( texture, textureProperty, uvSnippet, levelSnippet, depthSnippet, shaderStage );
snippet = this._generateTextureSampleLevel( texture, textureProperty, uvSnippet, levelSnippet, depthSnippet );

}

Expand Down Expand Up @@ -919,7 +914,7 @@ class WGSLNodeBuilder extends NodeBuilder {
texture.store = node.isStorageTextureNode === true;
texture.setVisibility( gpuShaderStageLib[ shaderStage ] );

if ( ( shaderStage === 'fragment' || shaderStage === 'compute' ) && this.isUnfilterable( node.value ) === false && texture.store === false ) {
if ( this.isUnfilterable( node.value ) === false && texture.store === false ) {

const sampler = new NodeSampler( `${ uniformNode.name }_sampler`, uniformNode.node, group );
sampler.setVisibility( gpuShaderStageLib[ shaderStage ] );
Expand Down Expand Up @@ -1664,7 +1659,7 @@ ${ flowData.code }

const texture = uniform.node.value;

if ( ( shaderStage === 'fragment' || shaderStage === 'compute' ) && this.isUnfilterable( texture ) === false && uniform.node.isStorageTextureNode !== true ) {
if ( this.isUnfilterable( texture ) === false && uniform.node.isStorageTextureNode !== true ) {

if ( this.isSampleCompare( texture ) ) {

Expand Down