Support Limits::max_bind_groups (gfx-rs#348)

* Pass max_bind_count down into Binder. * Use the existing hub. * Remove accidental newline.
kejor · Oct 15, 2019 · 78fbbba · 78fbbba
1 parent 5ba923c
commit 78fbbba
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/wgpu-native/Cargo.toml b/wgpu-native/Cargo.toml
@@ -35,6 +35,7 @@ raw-window-handle = "0.3"
 rendy-memory = { git = "https://github.com/amethyst/rendy", rev = "e8ffcabc2bc74fbb282d4f71fa55c28d0ec31c86" }
 rendy-descriptor = { git = "https://github.com/amethyst/rendy", rev = "e8ffcabc2bc74fbb282d4f71fa55c28d0ec31c86" }
 serde = { version = "1.0", features = ["serde_derive"], optional = true }
+smallvec = "0.6"
 vec_map = "0.8"
 
 [target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]

diff --git a/wgpu-native/src/command/bind.rs b/wgpu-native/src/command/bind.rs
@@ -13,13 +13,14 @@ use crate::{
 };
 
 use log::trace;
+use smallvec::{smallvec, SmallVec};
 
 use std::convert::identity;
 
-pub const MAX_BIND_GROUPS: usize = 4;
+pub const DEFAULT_BIND_GROUPS: usize = 4;
 type BindGroupMask = u8;
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct BindGroupPair {
     layout_id: BindGroupLayoutId,
     group_id: Stored<BindGroupId>,
@@ -53,7 +54,7 @@ where
     }
 }
 
-#[derive(Default, Debug)]
+#[derive(Clone, Default, Debug)]
 pub struct BindGroupEntry {
     expected_layout_id: Option<BindGroupLayoutId>,
     provided: Option<BindGroupPair>,
@@ -140,10 +141,17 @@ impl BindGroupEntry {
 #[derive(Default, Debug)]
 pub struct Binder {
     pub(crate) pipeline_layout_id: Option<PipelineLayoutId>, //TODO: strongly `Stored`
-    pub(crate) entries: [BindGroupEntry; MAX_BIND_GROUPS],
+    pub(crate) entries: SmallVec<[BindGroupEntry; DEFAULT_BIND_GROUPS]>,
 }
 
 impl Binder {
+    pub(crate) fn new(max_bind_groups: u32) -> Self {
+        Self {
+            pipeline_layout_id: None,
+            entries: smallvec![Default::default(); max_bind_groups as usize]
+        }
+    }
+
     pub(crate) fn reset_expectations(&mut self, length: usize) {
         for entry in self.entries[length ..].iter_mut() {
             entry.expected_layout_id = None;
@@ -175,7 +183,7 @@ impl Binder {
                 let compatible_count = self.compatible_count();
                 if index < compatible_count {
                     let end = compatible_count
-                        .min(if was_compatible { index + 1 } else { MAX_BIND_GROUPS });
+                        .min(if was_compatible { index + 1 } else { self.entries.len() });
                     trace!("\t\tbinding up to {}", end);
                     Some((
                         self.pipeline_layout_id?,

diff --git a/wgpu-native/src/command/mod.rs b/wgpu-native/src/command/mod.rs
@@ -712,6 +712,7 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
             },
             context,
             sample_count,
+            cmb.features.max_bind_groups,
         )
     };
     hub.render_passes.register_identity(id_in, pass, &mut token)

diff --git a/wgpu-native/src/command/render.rs b/wgpu-native/src/command/render.rs
@@ -136,12 +136,13 @@ impl<B: GfxBackend> RenderPass<B> {
         cmb_id: Stored<CommandBufferId>,
         context: RenderPassContext,
         sample_count: u8,
+        max_bind_groups: u32,
     ) -> Self {
         RenderPass {
             raw,
             cmb_id,
             context,
-            binder: Binder::default(),
+            binder: Binder::new(max_bind_groups),
             trackers: TrackerSet::new(B::VARIANT),
             blend_color_status: OptionalState::Unused,
             stencil_reference_status: OptionalState::Unused,

diff --git a/wgpu-native/src/device.rs b/wgpu-native/src/device.rs
@@ -513,6 +513,7 @@ impl<B: GfxBackend> Device<B> {
         queue_group: hal::queue::QueueGroup<B>,
         mem_props: hal::adapter::MemoryProperties,
         supports_texture_d24_s8: bool,
+        max_bind_groups: u32,
     ) -> Self {
         // don't start submission index at zero
         let life_guard = LifeGuard::new();
@@ -559,6 +560,7 @@ impl<B: GfxBackend> Device<B> {
                 ready_to_map: Vec::new(),
             }),
             features: Features {
+                max_bind_groups,
                 supports_texture_d24_s8,
             }
         }

diff --git a/wgpu-native/src/instance.rs b/wgpu-native/src/instance.rs
@@ -429,7 +429,7 @@ pub extern "C" fn wgpu_request_adapter(desc: Option<&RequestAdapterOptions>) ->
 
 pub fn adapter_request_device<B: GfxBackend>(
     adapter_id: AdapterId,
-    _desc: &DeviceDescriptor,
+    desc: &DeviceDescriptor,
     id_in: Input<DeviceId>,
 ) -> Output<DeviceId> {
     let hub = B::hub();
@@ -462,6 +462,10 @@ pub fn adapter_request_device<B: GfxBackend>(
             BIND_BUFFER_ALIGNMENT % limits.min_uniform_buffer_offset_alignment,
             "Adapter uniform buffer offset alignment not compatible with WGPU"
         );
+        assert!(
+            u32::from(limits.max_bound_descriptor_sets) >= desc.limits.max_bind_groups,
+            "Adapter does not support the requested max_bind_groups"
+        );
 
         let mem_props = adapter.physical_device.memory_properties();
 
@@ -477,6 +481,7 @@ pub fn adapter_request_device<B: GfxBackend>(
             gpu.queue_groups.swap_remove(0),
             mem_props,
             supports_texture_d24_s8,
+            desc.limits.max_bind_groups,
         )
     };
 

diff --git a/wgpu-native/src/lib.rs b/wgpu-native/src/lib.rs
@@ -223,5 +223,6 @@ macro_rules! gfx_select {
 
 #[derive(Clone, Copy, Debug)]
 pub(crate) struct Features {
+    pub max_bind_groups: u32,
     pub supports_texture_d24_s8: bool,
 }