Skip to content

Commit e6fdcca

Browse files
committed
Merge branch 'main' into return-statuses
2 parents e6fa1e3 + 14b1325 commit e6fdcca

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

webgpu.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2562,6 +2562,11 @@ typedef void (*WGPUProcDeviceGetFeatures)(WGPUDevice device, WGPUSupportedFeatur
25622562
* > @copydoc wgpuDeviceGetLimits
25632563
*/
25642564
typedef WGPUStatus (*WGPUProcDeviceGetLimits)(WGPUDevice device, WGPULimits * limits) WGPU_FUNCTION_ATTRIBUTE;
2565+
/**
2566+
* Proc pointer type for @ref wgpuDeviceGetLostFuture:
2567+
* > @copydoc wgpuDeviceGetLostFuture
2568+
*/
2569+
typedef WGPUFuture (*WGPUProcDeviceGetLostFuture)(WGPUDevice device) WGPU_FUNCTION_ATTRIBUTE;
25652570
/**
25662571
* Proc pointer type for @ref wgpuDeviceGetQueue:
25672572
* > @copydoc wgpuDeviceGetQueue
@@ -3400,6 +3405,11 @@ WGPU_EXPORT void wgpuDeviceGetFeatures(WGPUDevice device, WGPUSupportedFeatures
34003405
* Indicates if there was an @ref OutStructChainError.
34013406
*/
34023407
WGPU_EXPORT WGPUStatus wgpuDeviceGetLimits(WGPUDevice device, WGPULimits * limits) WGPU_FUNCTION_ATTRIBUTE;
3408+
/**
3409+
* @returns
3410+
* The @ref WGPUFuture for the device-lost event of the device.
3411+
*/
3412+
WGPU_EXPORT WGPUFuture wgpuDeviceGetLostFuture(WGPUDevice device) WGPU_FUNCTION_ATTRIBUTE;
34033413
WGPU_EXPORT WGPUQueue wgpuDeviceGetQueue(WGPUDevice device) WGPU_FUNCTION_ATTRIBUTE;
34043414
WGPU_EXPORT WGPUBool wgpuDeviceHasFeature(WGPUDevice device, WGPUFeatureName feature) WGPU_FUNCTION_ATTRIBUTE;
34053415
WGPU_EXPORT WGPUFuture wgpuDevicePopErrorScope(WGPUDevice device, WGPUPopErrorScopeCallbackInfo callbackInfo) WGPU_FUNCTION_ATTRIBUTE;

webgpu.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3926,6 +3926,12 @@ objects:
39263926
- name: destroy
39273927
doc: |
39283928
TODO
3929+
- name: get_lost_future
3930+
doc: ""
3931+
returns:
3932+
doc: |
3933+
The @ref WGPUFuture for the device-lost event of the device.
3934+
type: struct.future
39293935
- name: get_limits
39303936
doc: |
39313937
TODO

0 commit comments

Comments
 (0)