Skip to content

Fix setting instance validation flags (fixed #533) #570

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
cwfitzgerald merged 2 commits into from
Apr 5, 2026
Merged

Fix setting instance validation flags (fixed #533) #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b2eaa4
Fix setting instance validation flags (fixed #533)
lisyarus Apr 5, 2026
951e99d
Fix handling InstanceFlag_Default
lisyarus Apr 5, 2026
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
10 changes: 9 additions & 1 deletion ffi/wgpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,18 @@ static const WGPUInstanceBackend WGPUInstanceBackend_Secondary = (1 << 1) | (1 <
static const WGPUInstanceBackend WGPUInstanceBackend_Force32 = 0x7FFFFFFF;

typedef WGPUFlags WGPUInstanceFlag;
static const WGPUInstanceFlag WGPUInstanceFlag_Default = 0x00000000;
static const WGPUInstanceFlag WGPUInstanceFlag_Empty = 0x00000000;
static const WGPUInstanceFlag WGPUInstanceFlag_Debug = 1 << 0;
static const WGPUInstanceFlag WGPUInstanceFlag_Validation = 1 << 1;
static const WGPUInstanceFlag WGPUInstanceFlag_DiscardHalLabels = 1 << 2;
static const WGPUInstanceFlag WGPUInstanceFlag_AllowUnderlyingNoncompliantAdapter = 1 << 3;
static const WGPUInstanceFlag WGPUInstanceFlag_GPUBasedValidation = 1 << 4;
static const WGPUInstanceFlag WGPUInstanceFlag_ValidationIndirectCall = 1 << 5;
static const WGPUInstanceFlag WGPUInstanceFlag_AutomaticTimestampNormalization = 1 << 6;
static const WGPUInstanceFlag WGPUInstanceFlag_Default = 1 << 24;
static const WGPUInstanceFlag WGPUInstanceFlag_Debugging = 1 << 25;
static const WGPUInstanceFlag WGPUInstanceFlag_AdvancedDebugging = 1 << 26;
static const WGPUInstanceFlag WGPUInstanceFlag_WithEnv = 1 << 27;
static const WGPUInstanceFlag WGPUInstanceFlag_Force32 = 0x7FFFFFFF;

typedef enum WGPUDx12Compiler {
Expand Down
34 changes: 30 additions & 4 deletions src/conv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ pub fn map_instance_backend_flags(flags: native::WGPUInstanceBackend) -> wgt::Ba
#[inline]
pub fn map_instance_flags(flags: native::WGPUInstanceFlag) -> wgt::InstanceFlags {
let mut result = wgt::InstanceFlags::empty();

// Actual single-bit flags
if (flags & native::WGPUInstanceFlag_Debug) != 0 {
result.insert(wgt::InstanceFlags::DEBUG);
}
Expand All @@ -287,6 +289,33 @@ pub fn map_instance_flags(flags: native::WGPUInstanceFlag) -> wgt::InstanceFlags
if (flags & native::WGPUInstanceFlag_DiscardHalLabels) != 0 {
result.insert(wgt::InstanceFlags::DISCARD_HAL_LABELS);
}
if (flags & native::WGPUInstanceFlag_AllowUnderlyingNoncompliantAdapter) != 0 {
result.insert(wgt::InstanceFlags::ALLOW_UNDERLYING_NONCOMPLIANT_ADAPTER);
}
if (flags & native::WGPUInstanceFlag_GPUBasedValidation) != 0 {
result.insert(wgt::InstanceFlags::GPU_BASED_VALIDATION);
}
if (flags & native::WGPUInstanceFlag_ValidationIndirectCall) != 0 {
result.insert(wgt::InstanceFlags::VALIDATION_INDIRECT_CALL);
}
if (flags & native::WGPUInstanceFlag_AutomaticTimestampNormalization) != 0 {
result.insert(wgt::InstanceFlags::AUTOMATIC_TIMESTAMP_NORMALIZATION);
}

// Convenience helpers
if (flags & native::WGPUInstanceFlag_Default) != 0 {
result.insert(wgt::InstanceFlags::default());
}
if (flags & native::WGPUInstanceFlag_Debugging) != 0 {
result.insert(wgt::InstanceFlags::debugging());
}
if (flags & native::WGPUInstanceFlag_AdvancedDebugging) != 0 {
result.insert(wgt::InstanceFlags::advanced_debugging());
}
if (flags & native::WGPUInstanceFlag_WithEnv) != 0 {
result.insert(wgt::InstanceFlags::empty().with_env());
}

result
}

Expand Down Expand Up @@ -355,10 +384,7 @@ pub unsafe fn map_instance_descriptor(
},
noop: Default::default(),
},
flags: match extras.flags {
native::WGPUInstanceFlag_Default => wgt::InstanceFlags::default(),
flags => map_instance_flags(flags),
},
flags: map_instance_flags(extras.flags),
memory_budget_thresholds: wgt::MemoryBudgetThresholds {
for_device_loss,
for_resource_creation,
Expand Down
Loading