Skip to content

vulkan: Start on dynamic_state_commands system #7302

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

Draft
wants to merge 1 commit into
base: trunk
Choose a base branch
from
+545 −65
Draft

vulkan: Start on dynamic_state_commands system #7302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
107 changes: 105 additions & 2 deletions wgpu-hal/src/vulkan/adapter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ use std::{borrow::ToOwned as _, collections::BTreeMap, ffi::CStr, sync::Arc, vec
use ash::{amd, ext, google, khr, vk};
use parking_lot::Mutex;

use crate::vulkan::DynamicStateFlags;

use super::conv;

fn depth_stencil_required_flags() -> vk::FormatFeatureFlags {
Expand Down Expand Up @@ -120,11 +122,17 @@ pub struct PhysicalDeviceFeatures {
/// Features provided by `VK_EXT_subgroup_size_control`, promoted to Vulkan 1.3.
subgroup_size_control: Option<vk::PhysicalDeviceSubgroupSizeControlFeatures<'static>>,

/// Features proved by `VK_KHR_maintenance4`, needed for mesh shaders
/// Features provided by `VK_KHR_maintenance4`, needed for mesh shaders
maintenance4: Option<vk::PhysicalDeviceMaintenance4FeaturesKHR<'static>>,

/// Features proved by `VK_EXT_mesh_shader`
/// Features provided by `VK_EXT_mesh_shader`
mesh_shader: Option<vk::PhysicalDeviceMeshShaderFeaturesEXT<'static>>,

/// Features provided by `VK_EXT_extended_dynamic_state`
extended_dynamic_state: Option<vk::PhysicalDeviceExtendedDynamicStateFeaturesEXT<'static>>,

/// Features provided by `VK_EXT_extended_dynamic_state3`
extended_dynamic_state3: Option<vk::PhysicalDeviceExtendedDynamicState3FeaturesEXT<'static>>,
}

impl PhysicalDeviceFeatures {
Expand Down Expand Up @@ -192,6 +200,9 @@ impl PhysicalDeviceFeatures {
if let Some(ref mut feature) = self.mesh_shader {
info = info.push_next(feature);
}
if let Some(ref mut feature) = self.extended_dynamic_state {
info = info.push_next(feature);
}
info
}

Expand Down Expand Up @@ -513,6 +524,45 @@ impl PhysicalDeviceFeatures {
} else {
None
},
extended_dynamic_state: if device_api_version < vk::API_VERSION_1_3
&& enabled_extensions.contains(&ext::extended_dynamic_state::NAME)
{
Some(
vk::PhysicalDeviceExtendedDynamicStateFeaturesEXT::default()
.extended_dynamic_state(true),
)
} else {
None
},
extended_dynamic_state3: if enabled_extensions
.contains(&ext::extended_dynamic_state3::NAME)
{
Some(
vk::PhysicalDeviceExtendedDynamicState3FeaturesEXT::default()
.extended_dynamic_state3_depth_clamp_enable(
private_caps
.dynamic_state_flags
.contains(DynamicStateFlags::DEPTH_CLAMP_ENABLE),
)
.extended_dynamic_state3_color_blend_enable(
private_caps
.dynamic_state_flags
.contains(DynamicStateFlags::COLOR_BLEND_ENABLE),
)
.extended_dynamic_state3_color_blend_equation(
private_caps
.dynamic_state_flags
.contains(DynamicStateFlags::COLOR_BLEND_EQUATION),
)
.extended_dynamic_state3_polygon_mode(
private_caps
.dynamic_state_flags
.contains(DynamicStateFlags::POLYGON_MODE),
),
)
} else {
None
},
}
}

Expand Down Expand Up @@ -1516,6 +1566,13 @@ impl super::InstanceShared {
features2 = features2.push_next(next);
}

if capabilities.supports_extension(ext::extended_dynamic_state::NAME) {
let next = features
.extended_dynamic_state
.insert(vk::PhysicalDeviceExtendedDynamicStateFeaturesEXT::default());
features2 = features2.push_next(next);
}

unsafe { get_device_properties.get_physical_device_features2(phd, &mut features2) };
features2.features
} else {
Expand Down Expand Up @@ -1641,6 +1698,30 @@ impl super::Instance {
return None;
}

let mut dynamic_state_flags = DynamicStateFlags::empty();
if let Some(feature) = phd_features.extended_dynamic_state {
if feature.extended_dynamic_state == vk::TRUE {
dynamic_state_flags |= DynamicStateFlags::CULL_MODE
| DynamicStateFlags::DEPTH_TEST_ENABLE
| DynamicStateFlags::DEPTH_WRITE_ENABLE
| DynamicStateFlags::FRONT_FACE;
}
}
if let Some(feature) = phd_features.extended_dynamic_state3 {
if feature.extended_dynamic_state3_depth_clamp_enable == vk::TRUE {
dynamic_state_flags |= DynamicStateFlags::DEPTH_CLAMP_ENABLE;
}
if feature.extended_dynamic_state3_color_blend_enable == vk::TRUE {
dynamic_state_flags |= DynamicStateFlags::COLOR_BLEND_ENABLE;
}
if feature.extended_dynamic_state3_color_blend_equation == vk::TRUE {
dynamic_state_flags |= DynamicStateFlags::COLOR_BLEND_EQUATION;
}
if feature.extended_dynamic_state3_polygon_mode == vk::TRUE {
dynamic_state_flags |= DynamicStateFlags::POLYGON_MODE;
}
}

let private_caps = super::PrivateCapabilities {
flip_y_requires_shift: phd_capabilities.device_api_version >= vk::API_VERSION_1_1
|| phd_capabilities.supports_extension(khr::maintenance1::NAME),
Expand Down Expand Up @@ -1708,6 +1789,7 @@ impl super::Instance {
.properties
.limits
.max_sampler_allocation_count,
dynamic_state_flags,
};
let capabilities = crate::Capabilities {
limits: phd_capabilities.to_wgpu_limits(),
Expand Down Expand Up @@ -1892,6 +1974,25 @@ impl super::Adapter {
} else {
None
};
let extended_dynamic_state_fns =
if self.phd_capabilities.device_api_version >= vk::API_VERSION_1_3 {
Some(super::ExtensionFn::Promoted)
} else if enabled_extensions.contains(&ext::extended_dynamic_state::NAME) {
Some(super::ExtensionFn::Extension(
ext::extended_dynamic_state::Device::new(&self.instance.raw, &raw_device),
))
} else {
None
};
let extended_dynamic_state3_fns =
if enabled_extensions.contains(&ext::extended_dynamic_state3::NAME) {
Some(ext::extended_dynamic_state3::Device::new(
&self.instance.raw,
&raw_device,
))
} else {
None
};

let naga_options = {
use naga::back::spv;
Expand Down Expand Up @@ -2071,6 +2172,8 @@ impl super::Adapter {
timeline_semaphore: timeline_semaphore_fn,
ray_tracing: ray_tracing_fns,
mesh_shading: mesh_shading_fns,
extended_dynamic_state: extended_dynamic_state_fns,
extended_dynamic_state3: extended_dynamic_state3_fns,
},
pipeline_cache_validation_key,
vendor_id: self.phd_capabilities.properties.vendor_id,
Expand Down
135 changes: 133 additions & 2 deletions wgpu-hal/src/vulkan/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::conv;
use super::{conv, ExtensionFn};

use arrayvec::ArrayVec;
use ash::vk;
Expand Down Expand Up @@ -931,7 +931,138 @@ impl crate::CommandEncoder for super::CommandEncoder {
self.active,
vk::PipelineBindPoint::GRAPHICS,
pipeline.raw,
)
);

for cmd in pipeline.dynamic_state_commands.iter() {
match cmd {
super::DynamicStateCommand::SetStencilMasks {
read_mask,
write_mask,
} => {
self.device.raw.cmd_set_stencil_compare_mask(
self.active,
vk::StencilFaceFlags::FRONT_AND_BACK,
*read_mask,
);
self.device.raw.cmd_set_stencil_write_mask(
self.active,
vk::StencilFaceFlags::FRONT_AND_BACK,
*write_mask,
);
}
super::DynamicStateCommand::SetDepthBias {
constant,
clamp,
slope,
} => {
self.device
.raw
.cmd_set_depth_bias(self.active, *constant, *clamp, *slope);
}
super::DynamicStateCommand::SetDepthTest(enable) => {
match self
.device
.extension_fns
.extended_dynamic_state
.as_ref()
.unwrap()
{
ExtensionFn::Promoted => {
self.device
.raw
.cmd_set_depth_test_enable(self.active, *enable);
}
ExtensionFn::Extension(ext) => {
ext.cmd_set_depth_test_enable(self.active, *enable);
}
}
}
super::DynamicStateCommand::SetDepthCompare(compare) => {
match self
.device
.extension_fns
.extended_dynamic_state
.as_ref()
.unwrap()
{
ExtensionFn::Promoted => {
self.device
.raw
.cmd_set_depth_compare_op(self.active, *compare);
}
ExtensionFn::Extension(ext) => {
ext.cmd_set_depth_compare_op(self.active, *compare);
}
}
}
super::DynamicStateCommand::SetDepthWrite(enable) => {
match self
.device
.extension_fns
.extended_dynamic_state
.as_ref()
.unwrap()
{
ExtensionFn::Promoted => {
self.device
.raw
.cmd_set_depth_write_enable(self.active, *enable);
}
ExtensionFn::Extension(ext) => {
ext.cmd_set_depth_write_enable(self.active, *enable);
}
}
}
super::DynamicStateCommand::SetCullMode(mode) => {
match self
.device
.extension_fns
.extended_dynamic_state
.as_ref()
.unwrap()
{
ExtensionFn::Promoted => {
self.device.raw.cmd_set_cull_mode(self.active, *mode);
}
ExtensionFn::Extension(ext) => {
ext.cmd_set_cull_mode(self.active, *mode);
}
}
}
super::DynamicStateCommand::SetFrontFace(mode) => {
match self
.device
.extension_fns
.extended_dynamic_state
.as_ref()
.unwrap()
{
ExtensionFn::Promoted => {
self.device.raw.cmd_set_front_face(self.active, *mode);
}
ExtensionFn::Extension(ext) => {
ext.cmd_set_front_face(self.active, *mode);
}
}
}
super::DynamicStateCommand::SetPolygonMode(mode) => {
self.device
.extension_fns
.extended_dynamic_state3
.as_ref()
.unwrap()
.cmd_set_polygon_mode(self.active, *mode);
}
super::DynamicStateCommand::SetDepthClampEnable(enable) => {
self.device
.extension_fns
.extended_dynamic_state3
.as_ref()
.unwrap()
.cmd_set_depth_clamp_enable(self.active, *enable);
}
}
}
};
}

Expand Down
17 changes: 7 additions & 10 deletions wgpu-hal/src/vulkan/conv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,10 +803,11 @@ pub fn map_front_face(front_face: wgt::FrontFace) -> vk::FrontFace {
}
}

pub fn map_cull_face(face: wgt::Face) -> vk::CullModeFlags {
pub fn map_cull_face(face: Option<wgt::Face>) -> vk::CullModeFlags {
match face {
wgt::Face::Front => vk::CullModeFlags::FRONT,
wgt::Face::Back => vk::CullModeFlags::BACK,
Some(wgt::Face::Front) => vk::CullModeFlags::FRONT,
Some(wgt::Face::Back) => vk::CullModeFlags::BACK,
None => vk::CullModeFlags::NONE,
}
}

Expand All @@ -824,18 +825,14 @@ pub fn map_stencil_op(op: wgt::StencilOperation) -> vk::StencilOp {
}
}

pub fn map_stencil_face(
face: &wgt::StencilFaceState,
compare_mask: u32,
write_mask: u32,
) -> vk::StencilOpState {
pub fn map_stencil_face(face: &wgt::StencilFaceState) -> vk::StencilOpState {
vk::StencilOpState {
fail_op: map_stencil_op(face.fail_op),
pass_op: map_stencil_op(face.pass_op),
depth_fail_op: map_stencil_op(face.depth_fail_op),
compare_op: map_comparison(face.compare),
compare_mask,
write_mask,
compare_mask: 0,
write_mask: 0,
reference: 0,
}
}
Expand Down
Loading