Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion tests/test_wgpu_native_query_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,10 @@ def test_render_timestamps_inside_passes():
runner.run_write_timestamp_inside_passes_test(render=True)


@pytest.mark.xfail(sys.platform == "darwin", reason="Known to currently fail on MacOS")
@pytest.mark.skipif(
sys.platform == "darwin",
reason="Known to currently fail (and sometimes hang) on MacOS",
)
def test_render_timestamps_inside_encoder():
runner = Runner()
if "timestamp-query-inside-encoders" not in runner.device.features:
Expand Down
4 changes: 2 additions & 2 deletions wgpu/backends/wgpu_native/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@


# The wgpu-native version that we target/expect
__version__ = "27.0.2.0"
__commit_sha__ = "74f8c24c903b6352d09f1928c56962ce06f77a4d"
__version__ = "27.0.4.0"
__commit_sha__ = "768f15f6ace8e4ec8e8720d5732b29e0b34250a8"
version_info = tuple(map(int, __version__.split("."))) # noqa: RUF048
_check_expected_version(version_info) # produces a warning on mismatch

Expand Down
6 changes: 3 additions & 3 deletions wgpu/resources/codegen_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
## Preparing
* The webgpu.idl defines 37 classes with 76 functions
* The webgpu.idl defines 5 flags, 34 enums, 60 structs
* webgpu.h/wgpu.h define 211 functions
* webgpu.h/wgpu.h define 7 flags, 61 enums, 103 structs
* webgpu.h/wgpu.h define 212 functions
* webgpu.h/wgpu.h define 7 flags, 62 enums, 103 structs
## Updating API
* Wrote 5 flags to flags.py
* Wrote 34 enums to enums.py
Expand Down Expand Up @@ -42,5 +42,5 @@
* Enum CanvasToneMappingMode missing in webgpu.h/wgpu.h
* Wrote 255 enum mappings and 47 struct-field mappings to wgpu_native/_mappings.py
* Validated 154 C function calls
* Not using 68 C functions
* Not using 69 C functions
* Validated 97 C structs
9 changes: 9 additions & 0 deletions wgpu/resources/wgpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,13 @@ typedef enum WGPUGLFenceBehaviour {
WGPUGLFenceBehaviour_Force32 = 0x7FFFFFFF
} WGPUGLFenceBehaviour;

typedef enum WGPUDx12SwapchainKind {
WGPUDx12SwapchainKind_Undefined = 0x00000000,
WGPUDx12SwapchainKind_DxgiFromHwnd = 0x00000001,
WGPUDx12SwapchainKind_DxgiFromVisual = 0x00000002,
WGPUDx12SwapchainKind_Force32 = 0x7FFFFFFF
} WGPUDx12SwapchainKind;

typedef struct WGPUInstanceExtras {
WGPUChainedStruct chain;
WGPUInstanceBackend backends;
Expand All @@ -146,6 +153,7 @@ typedef struct WGPUInstanceExtras {
WGPUGLFenceBehaviour glFenceBehaviour;
WGPUStringView dxcPath;
WGPUDxcMaxShaderModel dxcMaxShaderModel;
WGPUDx12SwapchainKind dx12PresentationSystem;

WGPU_NULLABLE const uint8_t* budgetForDeviceCreation;
WGPU_NULLABLE const uint8_t* budgetForDeviceLoss;
Expand Down Expand Up @@ -307,6 +315,7 @@ void wgpuGenerateReport(WGPUInstance instance, WGPUGlobalReport * report);
size_t wgpuInstanceEnumerateAdapters(WGPUInstance instance, WGPU_NULLABLE WGPUInstanceEnumerateAdapterOptions const * options, WGPUAdapter * adapters);

WGPUSubmissionIndex wgpuQueueSubmitForIndex(WGPUQueue queue, size_t commandCount, WGPUCommandBuffer const * commands);
float wgpuQueueGetTimestampPeriod(WGPUQueue queue);

// Returns true if the queue is empty, or false if there are more queue submissions still in flight.
WGPUBool wgpuDevicePoll(WGPUDevice device, WGPUBool wait, WGPU_NULLABLE WGPUSubmissionIndex const * submissionIndex);
Expand Down