Skip to content

Commit

Permalink
Rename Features, Properties to DeviceFeatures, `DevicePropertie…
Browse files Browse the repository at this point in the history 
…s` (#2481)

* Rename `Features`, `Properties` to `DeviceFeatures`, `DeviceProperties`

* Merge
  • Loading branch information
@Rua
Rua authored Mar 4, 2024
1 parent aeb7a3a commit 6a5aed4
Show file tree
Hide file tree
Showing 65 changed files with 843 additions and 788 deletions.
6 changes: 3 additions & 3 deletions examples/mesh-shader/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use vulkano::{
allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet,
},
device::{
physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, Features,
physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, DeviceFeatures,
QueueCreateInfo, QueueFlags,
},
image::{view::ImageView, Image, ImageUsage},
Expand Down Expand Up @@ -139,9 +139,9 @@ fn main() -> Result<(), impl Error> {
physical_device,
DeviceCreateInfo {
enabled_extensions: device_extensions,
enabled_features: Features {
enabled_features: DeviceFeatures {
mesh_shader: true,
..Features::default()
..DeviceFeatures::default()
},
queue_create_infos: vec![QueueCreateInfo {
queue_family_index,
Expand Down
6 changes: 3 additions & 3 deletions examples/multiview/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use vulkano::{
RenderPassBeginInfo,
},
device::{
physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, Features,
physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, DeviceFeatures,
QueueCreateInfo, QueueFlags,
},
format::Format,
Expand Down Expand Up @@ -63,11 +63,11 @@ fn main() {
let device_extensions = DeviceExtensions {
..DeviceExtensions::empty()
};
let features = Features {
let features = DeviceFeatures {
// enabling the `multiview` feature will use the `VK_KHR_multiview` extension on Vulkan 1.0
// and the device feature on Vulkan 1.1+.
multiview: true,
..Features::empty()
..DeviceFeatures::empty()
};
let (physical_device, queue_family_index) = instance
.enumerate_physical_devices()
Expand Down
6 changes: 3 additions & 3 deletions examples/runtime-array/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use vulkano::{
WriteDescriptorSet,
},
device::{
physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, Features,
physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, DeviceFeatures,
QueueCreateInfo, QueueFlags,
},
format::Format,
Expand Down Expand Up @@ -111,12 +111,12 @@ fn main() -> Result<(), impl Error> {
..Default::default()
}],
enabled_extensions: device_extensions,
enabled_features: Features {
enabled_features: DeviceFeatures {
descriptor_indexing: true,
shader_uniform_buffer_array_non_uniform_indexing: true,
runtime_descriptor_array: true,
descriptor_binding_variable_descriptor_count: true,
..Features::empty()
..DeviceFeatures::empty()
},
..Default::default()
},
Expand Down
6 changes: 3 additions & 3 deletions examples/tessellation/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use vulkano::{
CommandBufferUsage, RecordingCommandBuffer, RenderPassBeginInfo,
},
device::{
physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, Features,
physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, DeviceFeatures,
QueueCreateInfo, QueueFlags,
},
image::{view::ImageView, Image, ImageUsage},
Expand Down Expand Up @@ -172,10 +172,10 @@ fn main() -> Result<(), impl Error> {
khr_swapchain: true,
..DeviceExtensions::empty()
};
let features = Features {
let features = DeviceFeatures {
tessellation_shader: true,
fill_mode_non_solid: true,
..Features::empty()
..DeviceFeatures::empty()
};
let (physical_device, queue_family_index) = instance
.enumerate_physical_devices()
Expand Down
6 changes: 3 additions & 3 deletions examples/triangle-v1_3/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use vulkano::{
CommandBufferUsage, RecordingCommandBuffer, RenderingAttachmentInfo, RenderingInfo,
},
device::{
physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, Features,
physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, DeviceFeatures,
QueueCreateInfo, QueueFlags,
},
image::{view::ImageView, Image, ImageUsage},
Expand Down Expand Up @@ -202,9 +202,9 @@ fn main() -> Result<(), impl Error> {
// standard triangle example. The feature is required to be supported by the device if
// it supports Vulkan 1.3 and higher, or if the `khr_dynamic_rendering` extension is
// available, so we don't need to check for support.
enabled_features: Features {
enabled_features: DeviceFeatures {
dynamic_rendering: true,
..Features::empty()
..DeviceFeatures::empty()
},

..Default::default()
Expand Down
11 changes: 6 additions & 5 deletions vulkano-util/src/context.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ use vulkano::instance::InstanceCreateFlags;
use vulkano::{
device::{
physical::{PhysicalDevice, PhysicalDeviceType},
Device, DeviceCreateInfo, DeviceExtensions, Features, Queue, QueueCreateInfo, QueueFlags,
Device, DeviceCreateInfo, DeviceExtensions, DeviceFeatures, Queue, QueueCreateInfo,
QueueFlags,
},
instance::{
debug::{DebugUtilsMessenger, DebugUtilsMessengerCreateInfo},
Expand Down Expand Up @@ -33,7 +34,7 @@ pub struct VulkanoConfig {

pub device_extensions: DeviceExtensions,

pub device_features: Features,
pub device_features: DeviceFeatures,

/// Print your selected device name at start.
pub print_device_name: bool,
Expand Down Expand Up @@ -73,7 +74,7 @@ impl Default for VulkanoConfig {
}),
print_device_name: false,
device_extensions,
device_features: Features::empty(),
device_features: DeviceFeatures::empty(),
}
}
}
Expand Down Expand Up @@ -195,7 +196,7 @@ impl VulkanoContext {
fn create_device(
physical_device: Arc<PhysicalDevice>,
device_extensions: DeviceExtensions,
features: Features,
device_features: DeviceFeatures,
) -> (Arc<Device>, Arc<Queue>, Arc<Queue>) {
let queue_family_graphics = physical_device
.queue_family_properties()
Expand Down Expand Up @@ -241,7 +242,7 @@ impl VulkanoContext {
DeviceCreateInfo {
queue_create_infos,
enabled_extensions: device_extensions,
enabled_features: features,
enabled_features: device_features,
..Default::default()
},
)
Expand Down
14 changes: 7 additions & 7 deletions vulkano/autogen/extensions.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ fn device_extensions_output(members: &[ExtensionsMember]) -> TokenStream {
api_version,
device_extensions,
instance_extensions,
features: _,
device_features: _,
}| {
device_extensions.is_empty()
&& (api_version.is_some() || !instance_extensions.is_empty())
Expand All @@ -104,7 +104,7 @@ fn device_extensions_output(members: &[ExtensionsMember]) -> TokenStream {
api_version,
device_extensions: _,
instance_extensions,
features: _,
device_features: _,
}| {
let condition_items = (api_version.iter().map(|version| {
let version = format_ident!("V{}_{}", version.0, version.1);
Expand Down Expand Up @@ -188,15 +188,15 @@ fn device_extensions_output(members: &[ExtensionsMember]) -> TokenStream {
api_version: _,
device_extensions,
instance_extensions: _,
features: _,
device_features: _,
}| (!device_extensions.is_empty()),
)
.map(
|RequiresOneOf {
api_version,
device_extensions,
instance_extensions: _,
features: _,
device_features: _,
}| {
let condition_items = api_version
.iter()
Expand Down Expand Up @@ -313,7 +313,7 @@ fn instance_extensions_output(members: &[ExtensionsMember]) -> TokenStream {
api_version,
device_extensions: _,
instance_extensions,
features: _,
device_features: _,
}| {
api_version.filter(|_| instance_extensions.is_empty()).map(|(major, minor)| {
let version = format_ident!("V{}_{}", major, minor);
Expand Down Expand Up @@ -379,15 +379,15 @@ fn instance_extensions_output(members: &[ExtensionsMember]) -> TokenStream {
api_version: _,
device_extensions: _,
instance_extensions,
features: _,
device_features: _,
}| (!instance_extensions.is_empty()),
)
.map(
|RequiresOneOf {
api_version,
device_extensions: _,
instance_extensions,
features: _,
device_features: _,
}| {
let condition_items = api_version
.iter()
Expand Down
Loading

0 comments on commit 6a5aed4

Please sign in to comment.