Skip to content

Commit

Permalink
WebGPURenderer: Improve copyTextureToBuffer support (#27569)
Browse files Browse the repository at this point in the history 
* WebGPURenderer improve copyTextureToBuffer

* remove unecessary comment

* correct comment
  • Loading branch information
@RenaudRohlinger
RenaudRohlinger committed Jan 17, 2024
1 parent 6a3efed commit 96cb1b5
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 12 deletions.
5 changes: 3 additions & 2 deletions examples/jsm/renderers/webgl/utils/WebGLTextureUtils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -620,10 +620,11 @@ class WebGLTextureUtils {
if ( glType === gl.UNSIGNED_SHORT_5_5_5_1 ) return Uint16Array;
if ( glType === gl.UNSIGNED_SHORT_5_6_5 ) return Uint16Array;
if ( glType === gl.UNSIGNED_SHORT ) return Uint16Array;

if ( glType === gl.UNSIGNED_INT ) return Uint32Array;

if ( glType === gl.UNSIGNED_FLOAT ) return Float32Array;
if ( glType === gl.FLOAT ) return Float32Array;

throw new Error( `Unsupported WebGL type: ${glType}` );

}

Expand Down
79 changes: 69 additions & 10 deletions examples/jsm/renderers/webgpu/utils/WebGPUTextureUtils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,9 @@ class WebGPUTextureUtils {
const format = textureData.textureDescriptorGPU.format;
const bytesPerTexel = this._getBytesPerTexel( format );

let bytesPerRow = width * bytesPerTexel;
bytesPerRow = Math.ceil( bytesPerRow / 256 ) * 256; // Align to 256 bytes

const readBuffer = device.createBuffer(
{
size: width * height * bytesPerTexel,
Expand All @@ -390,7 +393,7 @@ class WebGPUTextureUtils {
},
{
buffer: readBuffer,
bytesPerRow: width * bytesPerTexel
bytesPerRow: bytesPerRow
},
{
width: width,
Expand Down Expand Up @@ -679,15 +682,57 @@ class WebGPUTextureUtils {

_getBytesPerTexel( format ) {

if ( format === GPUTextureFormat.R8Unorm ) return 1;
if ( format === GPUTextureFormat.R16Float ) return 2;
if ( format === GPUTextureFormat.RG8Unorm ) return 2;
if ( format === GPUTextureFormat.RG16Float ) return 4;
if ( format === GPUTextureFormat.R32Float ) return 4;
if ( format === GPUTextureFormat.RGBA8Unorm || format === GPUTextureFormat.RGBA8UnormSRGB ) return 4;
if ( format === GPUTextureFormat.RG32Float ) return 8;
if ( format === GPUTextureFormat.RGBA16Float ) return 8;
if ( format === GPUTextureFormat.RGBA32Float ) return 16;
// 8-bit formats
if ( format === GPUTextureFormat.R8Unorm ||
format === GPUTextureFormat.R8Snorm ||
format === GPUTextureFormat.R8Uint ||
format === GPUTextureFormat.R8Sint ) return 1;

// 16-bit formats
if ( format === GPUTextureFormat.R16Uint ||
format === GPUTextureFormat.R16Sint ||
format === GPUTextureFormat.R16Float ||
format === GPUTextureFormat.RG8Unorm ||
format === GPUTextureFormat.RG8Snorm ||
format === GPUTextureFormat.RG8Uint ||
format === GPUTextureFormat.RG8Sint ) return 2;

// 32-bit formats
if ( format === GPUTextureFormat.R32Uint ||
format === GPUTextureFormat.R32Sint ||
format === GPUTextureFormat.R32Float ||
format === GPUTextureFormat.RG16Uint ||
format === GPUTextureFormat.RG16Sint ||
format === GPUTextureFormat.RG16Float ||
format === GPUTextureFormat.RGBA8Unorm ||
format === GPUTextureFormat.RGBA8UnormSRGB ||
format === GPUTextureFormat.RGBA8Snorm ||
format === GPUTextureFormat.RGBA8Uint ||
format === GPUTextureFormat.RGBA8Sint ||
format === GPUTextureFormat.BGRA8Unorm ||
format === GPUTextureFormat.BGRA8UnormSRGB ||
// Packed 32-bit formats
format === GPUTextureFormat.RGB9E5UFloat ||
format === GPUTextureFormat.RGB10A2Unorm ||
format === GPUTextureFormat.RG11B10UFloat ||
format === GPUTextureFormat.Depth32Float ||
format === GPUTextureFormat.Depth24Plus ||
format === GPUTextureFormat.Depth24PlusStencil8 ||
format === GPUTextureFormat.Depth32FloatStencil8 ) return 4;

// 64-bit formats
if ( format === GPUTextureFormat.RG32Uint ||
format === GPUTextureFormat.RG32Sint ||
format === GPUTextureFormat.RG32Float ||
format === GPUTextureFormat.RGBA16Uint ||
format === GPUTextureFormat.RGBA16Sint ||
format === GPUTextureFormat.RGBA16Float ) return 8;

// 128-bit formats
if ( format === GPUTextureFormat.RGBA32Uint ||
format === GPUTextureFormat.RGBA32Sint ||
format === GPUTextureFormat.RGBA32Float ) return 16;


}

Expand All @@ -713,6 +758,9 @@ class WebGPUTextureUtils {
if ( format === GPUTextureFormat.RG16Sint ) return Int16Array;
if ( format === GPUTextureFormat.RGBA16Uint ) return Uint16Array;
if ( format === GPUTextureFormat.RGBA16Sint ) return Int16Array;
if ( format === GPUTextureFormat.R16Float ) return Float32Array;
if ( format === GPUTextureFormat.RG16Float ) return Float32Array;
if ( format === GPUTextureFormat.RGBA16Float ) return Float32Array;


if ( format === GPUTextureFormat.R32Uint ) return Uint32Array;
Expand All @@ -725,6 +773,17 @@ class WebGPUTextureUtils {
if ( format === GPUTextureFormat.RGBA32Sint ) return Int32Array;
if ( format === GPUTextureFormat.RGBA32Float ) return Float32Array;

if ( format === GPUTextureFormat.BGRA8Unorm ) return Uint8Array;
if ( format === GPUTextureFormat.BGRA8UnormSRGB ) return Uint8Array;
if ( format === GPUTextureFormat.RGB10A2Unorm ) return Uint32Array;
if ( format === GPUTextureFormat.RGB9E5UFloat ) return Uint32Array;
if ( format === GPUTextureFormat.RG11B10UFloat ) return Uint32Array;

if ( format === GPUTextureFormat.Depth32Float ) return Float32Array;
if ( format === GPUTextureFormat.Depth24Plus ) return Uint32Array;
if ( format === GPUTextureFormat.Depth24PlusStencil8 ) return Uint32Array;
if ( format === GPUTextureFormat.Depth32FloatStencil8 ) return Float32Array;

}

_getDimension( texture ) {
Expand Down

0 comments on commit 96cb1b5

Please sign in to comment.