Rustification of Extensions and SamplerDescriptor

gfx-rs · Jun 2, 2020 · fae6b89 · fae6b89
1 parent 78ab563
commit fae6b89
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 30 deletions.
diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs
@@ -1003,16 +1003,15 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
         let (device_guard, mut token) = hub.devices.read(&mut token);
         let device = &device_guard[device_id];
 
-        if desc.anisotropy_clamp > 1 {
+        if let Some(clamp) = desc.anisotropy_clamp {
             assert!(
-                device.extensions.anisotropic_filtering,
+                device.extensions.contains(wgt::Extensions::ANISOTROPIC_FILTERING),
                 "Anisotropic clamp may only be used when the anisotropic filtering extension is enabled"
             );
-            let valid_clamp = desc.anisotropy_clamp <= MAX_ANISOTROPY
-                && conv::is_power_of_two(desc.anisotropy_clamp as u32);
+            let valid_clamp = clamp <= MAX_ANISOTROPY && conv::is_power_of_two(clamp as u32);
             assert!(
                 valid_clamp,
-                "Anisotropic clamp must be one of the values: 0, 1, 2, 4, 8, or 16"
+                "Anisotropic clamp must be one of the values: 1, 2, 4, 8, or 16"
             );
         }
 
@@ -1030,11 +1029,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
             comparison: conv::map_compare_function(desc.compare),
             border: hal::image::PackedColor(0),
             normalized: true,
-            anisotropy_clamp: if desc.anisotropy_clamp > 1 {
-                Some(desc.anisotropy_clamp)
-            } else {
-                None
-            },
+            anisotropy_clamp: desc.anisotropy_clamp,
         };
 
         let sampler = resource::Sampler {

diff --git a/wgpu-core/src/instance.rs b/wgpu-core/src/instance.rs
@@ -534,9 +534,12 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
 
         let features = adapter.raw.physical_device.features();
 
-        wgt::Extensions {
-            anisotropic_filtering: features.contains(hal::Features::SAMPLER_ANISOTROPY),
-        }
+        let mut extensions = wgt::Extensions::default();
+        extensions.set(
+            wgt::Extensions::ANISOTROPIC_FILTERING,
+            features.contains(hal::Features::SAMPLER_ANISOTROPY),
+        );
+        extensions
     }
 
     pub fn adapter_limits<B: GfxBackend>(&self, adapter_id: AdapterId) -> wgt::Limits {
@@ -601,7 +604,10 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
             }
 
             // Check features needed by extensions
-            if desc.extensions.anisotropic_filtering {
+            if desc
+                .extensions
+                .contains(wgt::Extensions::ANISOTROPIC_FILTERING)
+            {
                 assert!(
                     available_features.contains(hal::Features::SAMPLER_ANISOTROPY),
                     "Missing feature SAMPLER_ANISOTROPY for anisotropic filtering extension"

diff --git a/wgpu-types/src/lib.rs b/wgpu-types/src/lib.rs
@@ -100,16 +100,18 @@ impl From<Backend> for BackendBit {
     }
 }
 
-#[repr(C)]
-#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "trace", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-pub struct Extensions {
-    /// This is a native only extension. Support is planned to be added to webgpu,
-    /// but it is not yet implemented.
-    ///
-    /// https://github.com/gpuweb/gpuweb/issues/696
-    pub anisotropic_filtering: bool,
+bitflags::bitflags! {
+    #[repr(transparent)]
+    #[derive(Default)]
+    #[cfg_attr(feature = "trace", derive(Serialize))]
+    #[cfg_attr(feature = "replay", derive(Deserialize))]
+    pub struct Extensions: u64 {
+        /// This is a native only extension. Support is planned to be added to webgpu,
+        /// but it is not yet implemented.
+        ///
+        /// https://github.com/gpuweb/gpuweb/issues/696
+        const ANISOTROPIC_FILTERING = 0x01;
+    }
 }
 
 #[repr(C)]
@@ -178,7 +180,7 @@ pub fn read_spirv<R: io::Read + io::Seek>(mut x: R) -> io::Result<Vec<u32>> {
 bitflags::bitflags! {
     #[repr(transparent)]
     #[cfg_attr(feature = "trace", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
+    #[cfg_attr(feature = "replay", derive(Deserialize))]
     pub struct ShaderStage: u32 {
         const NONE = 0;
         const VERTEX = 1;
@@ -401,7 +403,7 @@ pub enum TextureFormat {
 bitflags::bitflags! {
     #[repr(transparent)]
     #[cfg_attr(feature = "trace", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
+    #[cfg_attr(feature = "replay", derive(Deserialize))]
     pub struct ColorWrite: u32 {
         const RED = 1;
         const GREEN = 2;
@@ -939,7 +941,6 @@ impl Default for FilterMode {
     }
 }
 
-#[repr(C)]
 #[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "trace", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
@@ -955,10 +956,10 @@ pub struct SamplerDescriptor<L> {
     pub lod_max_clamp: f32,
     pub compare: CompareFunction,
     /// Anisotropic filtering extension must be enabled if this value is
-    /// anything other than 0 and 1.
+    /// anything other than 0 or 1.
     ///
-    /// Valid values are 0, 1, 2, 4, 8, and 16.
-    pub anisotropy_clamp: u8,
+    /// Valid values: 1, 2, 4, 8, and 16.
+    pub anisotropy_clamp: Option<u8>,
 }
 
 impl<L> SamplerDescriptor<L> {