Skip to content

WebGPURenderer: Texture fixes for WebGL backend #26797

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
Sep 18, 2023
Merged

WebGPURenderer: Texture fixes for WebGL backend #26797

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
3366a4c
misc texture fixes
Sep 15, 2023
2224280
remove surplus entry
Sep 18, 2023
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
2 changes: 1 addition & 1 deletion examples/jsm/nodes/accessors/TextureSizeNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class TextureSizeNode extends Node {
const textureProperty = this.textureNode.build( builder, 'property' );
const levelNode = this.levelNode.build( builder, 'int' );

return builder.format( `textureDimensions( ${textureProperty}, ${levelNode} )`, this.getNodeType( builder ), output );
return builder.format( `${builder.getMethod( 'textureDimensions' )}( ${textureProperty}, ${levelNode} )`, this.getNodeType( builder ), output );

}

Expand Down
22 changes: 19 additions & 3 deletions examples/jsm/renderers/webgl/WebGLBackend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,12 @@ class WebGLBackend extends Backend {
textureUtils.setTextureParameters( glTextureType, texture );

gl.bindTexture( glTextureType, textureGPU );
gl.texStorage2D( glTextureType, levels, glInternalFormat, width, height );

if ( ! texture.isVideoTexture ) {

gl.texStorage2D( glTextureType, levels, glInternalFormat, width, height );

}

this.set( texture, {
textureGPU,
Expand All @@ -298,17 +303,21 @@ class WebGLBackend extends Backend {

const { gl } = this;
const { width, height } = options;
const { textureGPU, glTextureType, glFormat, glType } = this.get( texture );
const { textureGPU, glTextureType, glFormat, glType, glInternalFormat } = this.get( texture );

const getImage = ( source ) => {

if ( source.isDataTexture ) {

return source.image.data;

} else if ( source instanceof ImageBitmap || source instanceof OffscreenCanvas ) {

return source;

}

return source;
return source.data;

};

Expand All @@ -326,6 +335,13 @@ class WebGLBackend extends Backend {

}

} else if ( texture.isVideoTexture ) {

texture.update();

gl.texImage2D( glTextureType, 0, glInternalFormat, glFormat, glType, options.image );


} else {

const image = getImage( options.image );
Expand Down
7 changes: 6 additions & 1 deletion examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import UniformsGroup from '../../common/UniformsGroup.js';
import { NodeSampledTexture, NodeSampledCubeTexture } from '../../common/nodes/NodeSampledTexture.js';

const glslMethods = {
[ MathNode.ATAN2 ]: 'atan'
[ MathNode.ATAN2 ]: 'atan',
textureDimensions: 'textureSize'
};

const precisionLib = {
Expand Down Expand Up @@ -35,6 +36,10 @@ class GLSLNodeBuilder extends NodeBuilder {

return `textureCube( ${textureProperty}, ${uvSnippet} )`;

} else if ( texture.isDepthTexture ) {

return `texture( ${textureProperty}, ${uvSnippet} ).x`;

} else {

return `texture( ${textureProperty}, ${uvSnippet} )`;
Expand Down