Skip to content

Commit 1c1ddb3

Browse files
authored
WebGPURenderer: Update to latest API. (#22034)
1 parent 354c8f6 commit 1c1ddb3

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

examples/jsm/renderers/webgpu/WebGPURenderer.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ class WebGPURenderer {
138138

139139
}
140140

141-
this._parameters.nonGuaranteedFeatures = ( parameters.nonGuaranteedFeatures === undefined ) ? [] : parameters.nonGuaranteedFeatures;
142-
this._parameters.nonGuaranteedLimits = ( parameters.nonGuaranteedLimits === undefined ) ? {} : parameters.nonGuaranteedLimits;
141+
this._parameters.requiredFeatures = ( parameters.requiredFeatures === undefined ) ? [] : parameters.requiredFeatures;
142+
this._parameters.requiredLimits = ( parameters.requiredLimits === undefined ) ? {} : parameters.requiredLimits;
143143

144144
}
145145

@@ -154,8 +154,8 @@ class WebGPURenderer {
154154
const adapter = await navigator.gpu.requestAdapter( adapterOptions );
155155

156156
const deviceDescriptor = {
157-
nonGuaranteedFeatures: parameters.nonGuaranteedFeatures,
158-
nonGuaranteedLimits: parameters.nonGuaranteedLimits
157+
requiredFeatures: parameters.requiredFeatures,
158+
requiredLimits: parameters.requiredLimits
159159
};
160160

161161
const device = await adapter.requestDevice( deviceDescriptor );
@@ -164,7 +164,7 @@ class WebGPURenderer {
164164

165165
const context = ( parameters.context !== undefined ) ? parameters.context : this.domElement.getContext( 'gpupresent' );
166166

167-
const swapChain = context.configureSwapChain( {
167+
const swapChain = context.configure( {
168168
device: device,
169169
format: GPUTextureFormat.BRGA8Unorm // this is the only valid swap chain format right now (r121)
170170
} );
@@ -256,11 +256,11 @@ class WebGPURenderer {
256256
if ( this._parameters.antialias === true ) {
257257

258258
colorAttachment.view = this._colorBuffer.createView();
259-
colorAttachment.resolveTarget = this._swapChain.getCurrentTexture().createView();
259+
colorAttachment.resolveTarget = this._context.getCurrentTexture().createView();
260260

261261
} else {
262262

263-
colorAttachment.view = this._swapChain.getCurrentTexture().createView();
263+
colorAttachment.view = this._context.getCurrentTexture().createView();
264264
colorAttachment.resolveTarget = undefined;
265265

266266
}

examples/jsm/renderers/webgpu/WebGPUTextures.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ class WebGPUTextures {
366366

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

369-
this._copyImageBitmapToTexture( imageBitmap, textureGPU );
369+
this._copyExternalImageToTexture( imageBitmap, textureGPU );
370370

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

@@ -416,19 +416,19 @@ class WebGPUTextures {
416416

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

419-
this._copyImageBitmapToTexture( imageBitmap, textureGPU, { x: 0, y: 0, z: i } );
419+
this._copyExternalImageToTexture( imageBitmap, textureGPU, { x: 0, y: 0, z: i } );
420420

421421
} );
422422

423423
}
424424

425425
}
426426

427-
_copyImageBitmapToTexture( image, textureGPU, origin = { x: 0, y: 0, z: 0 } ) {
427+
_copyExternalImageToTexture( image, textureGPU, origin = { x: 0, y: 0, z: 0 } ) {
428428

429-
this.device.queue.copyImageBitmapToTexture(
429+
this.device.queue.copyExternalImageToTexture(
430430
{
431-
imageBitmap: image
431+
source: image
432432
}, {
433433
texture: textureGPU,
434434
mipLevel: 0,

examples/webgpu_sandbox.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177

178178
//
179179

180-
renderer = new WebGPURenderer( { nonGuaranteedFeatures: [ 'texture-compression-bc' ] } );
180+
renderer = new WebGPURenderer( { requiredFeatures: [ 'texture-compression-bc' ] } );
181181
renderer.setPixelRatio( window.devicePixelRatio );
182182
renderer.setSize( window.innerWidth, window.innerHeight );
183183
document.body.appendChild( renderer.domElement );

0 commit comments

Comments
 (0)