Skip to content

WebGPUTextures: Upload texture in the same frame if possible and cleanup. #25821

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 2 commits into from
Apr 13, 2023
Merged

WebGPUTextures: Upload texture in the same frame if possible and cleanup. #25821

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68872c6
WebGPUTextures: Upload texture in the same frame if possible and clea…
sunag Apr 12, 2023
17bdc8c
WebGPUTextures: cleanup
sunag Apr 13, 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
96 changes: 62 additions & 34 deletions examples/jsm/renderers/webgpu/WebGPUTextures.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ class WebGPUTextures {

let usage = GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST;

if ( needsMipmaps === true ) {
if ( needsMipmaps ) {

// current mipmap generation requires RENDER_ATTACHMENT

Expand Down Expand Up @@ -421,33 +421,23 @@ class WebGPUTextures {

if ( texture.isDataTexture || texture.isDataArrayTexture || texture.isData3DTexture ) {

this._copyBufferToTexture( image, format, textureGPU );

if ( needsMipmaps === true ) this._generateMipmaps( textureGPU, textureGPUDescriptor );
this._copyBufferToTexture( image, textureGPU, textureGPUDescriptor, needsMipmaps );

} else if ( texture.isCompressedTexture ) {

this._copyCompressedBufferToTexture( texture.mipmaps, format, textureGPU );
this._copyCompressedBufferToTexture( texture.mipmaps, textureGPU, textureGPUDescriptor );

} else if ( texture.isCubeTexture ) {

if ( image.length === 6 ) {

this._copyCubeMapToTexture( image, format, texture, textureGPU, textureGPUDescriptor, needsMipmaps );
this._copyCubeMapToTexture( image, texture, textureGPU, textureGPUDescriptor, needsMipmaps );

}

} else if ( texture.isDepthTexture !== true && image !== null ) {

// assume HTMLImageElement, HTMLCanvasElement or ImageBitmap

this._getImageBitmap( image, texture ).then( imageBitmap => {

this._copyExternalImageToTexture( imageBitmap, textureGPU );

if ( needsMipmaps === true ) this._generateMipmaps( textureGPU, textureGPUDescriptor );

} );
this._copyImageToTexture( image, texture, textureGPU, textureGPUDescriptor, needsMipmaps );

}

Expand All @@ -460,21 +450,21 @@ class WebGPUTextures {

}

_copyBufferToTexture( image, format, textureGPU, origin = { x: 0, y: 0, z: 0 } ) {
_copyBufferToTexture( image, textureGPU, textureGPUDescriptor, needsMipmaps, originDepth = 0 ) {

// @TODO: Consider to use GPUCommandEncoder.copyBufferToTexture()
// @TODO: Consider to support valid buffer layouts with other formats like RGB

const data = image.data;

const bytesPerTexel = this._getBytesPerTexel( format );
const bytesPerTexel = this._getBytesPerTexel( textureGPUDescriptor.format );
const bytesPerRow = image.width * bytesPerTexel;

this.device.queue.writeTexture(
{
texture: textureGPU,
mipLevel: 0,
origin
origin: { x: 0, y: 0, z: originDepth }
},
data,
{
Expand All @@ -487,45 +477,39 @@ class WebGPUTextures {
depthOrArrayLayers: ( image.depth !== undefined ) ? image.depth : 1
} );

if ( needsMipmaps === true ) this._generateMipmaps( textureGPU, textureGPUDescriptor, originDepth );

}

_copyCubeMapToTexture( images, format, texture, textureGPU, textureGPUDescriptor, needsMipmaps ) {
_copyCubeMapToTexture( images, texture, textureGPU, textureGPUDescriptor, needsMipmaps ) {

for ( let i = 0; i < 6; i ++ ) {

const image = images[ i ];

if ( image.isDataTexture ) {

this._copyBufferToTexture( image.image, format, textureGPU, { z: i } );

if ( needsMipmaps === true ) this._generateMipmaps( textureGPU, textureGPUDescriptor, i );
this._copyBufferToTexture( image.image, textureGPU, textureGPUDescriptor, needsMipmaps, i );

} else {

this._getImageBitmap( image, texture ).then( imageBitmap => {

this._copyExternalImageToTexture( imageBitmap, textureGPU, { z: i } );

if ( needsMipmaps === true ) this._generateMipmaps( textureGPU, textureGPUDescriptor, i );

} );
this._copyImageToTexture( image, texture, textureGPU, textureGPUDescriptor, needsMipmaps, i );

}

}

}

_copyExternalImageToTexture( image, textureGPU, origin = { x: 0, y: 0, z: 0 } ) {
_copyExternalImageToTexture( image, textureGPU, originDepth ) {

this.device.queue.copyExternalImageToTexture(
{
source: image
}, {
texture: textureGPU,
mipLevel: 0,
origin
origin: { x: 0, y: 0, z: originDepth }
}, {
width: image.width,
height: image.height,
Expand All @@ -535,11 +519,11 @@ class WebGPUTextures {

}

_copyCompressedBufferToTexture( mipmaps, format, textureGPU ) {
_copyCompressedBufferToTexture( mipmaps, textureGPU, textureGPUDescriptor ) {

// @TODO: Consider to use GPUCommandEncoder.copyBufferToTexture()

const blockData = this._getBlockData( format );
const blockData = this._getBlockData( textureGPUDescriptor.format );

for ( let i = 0; i < mipmaps.length; i ++ ) {

Expand Down Expand Up @@ -732,6 +716,50 @@ class WebGPUTextures {

}

_isHTMLImage( image ) {

return ( typeof HTMLImageElement !== 'undefined' && image instanceof HTMLImageElement ) || ( typeof HTMLCanvasElement !== 'undefined' && image instanceof HTMLCanvasElement );

}

_copyImageToTexture( image, texture, textureGPU, textureGPUDescriptor, needsMipmaps, originDepth ) {

if ( this._isHTMLImage( image ) ) {

this._getImageBitmapFromHTML( image, texture ).then( imageBitmap => {

this._copyExternalImageToTexture( imageBitmap, textureGPU, originDepth );

if ( needsMipmaps ) this._generateMipmaps( textureGPU, textureGPUDescriptor, originDepth );

} );

} else {

// assume ImageBitmap

this._copyExternalImageToTexture( image, textureGPU, originDepth );

if ( needsMipmaps ) this._generateMipmaps( textureGPU, textureGPUDescriptor, originDepth );

}

}

_getImageBitmapFromHTML( image, texture ) {

const width = image.width;
const height = image.height;

const options = {};

options.imageOrientation = ( texture.flipY === true ) ? 'flipY' : 'none';
options.premultiplyAlpha = ( texture.premultiplyAlpha === true ) ? 'premultiply' : 'default';

return createImageBitmap( image, 0, 0, width, height, options );

}

_getImageBitmap( image, texture ) {

const width = image.width;
Expand Down Expand Up @@ -765,7 +793,7 @@ class WebGPUTextures {

mipLevelCount = texture.mipmaps.length;

} else if ( needsMipmaps === true ) {
} else if ( needsMipmaps ) {

mipLevelCount = Math.floor( Math.log2( Math.max( width, height ) ) ) + 1;

Expand Down