[msl-out] Add a get_ep_resources helper

gfx-rs · Feb 20, 2023 · 00c648e · 00c648e
1 parent 8f677dc
commit 00c648e
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/back/msl/mod.rs b/src/back/msl/mod.rs
@@ -329,12 +329,7 @@ impl Options {
         &self,
         ep: &crate::EntryPoint,
     ) -> Result<ResolvedBinding, EntryPointError> {
-        let slot = self
-            .per_entry_point_map
-            .as_ref()
-            .and_then(|map| map.get(&ep.name))
-            .and_then(|r| r.push_constant_buffer)
-            .or_else(|| self.per_stage_map[ep.stage].push_constant_buffer);
+        let slot = self.get_ep_resources(ep).push_constant_buffer;
         match slot {
             Some(slot) => Ok(ResolvedBinding::Resource(BindTarget {
                 buffer: Some(slot),
@@ -356,12 +351,7 @@ impl Options {
         &self,
         ep: &crate::EntryPoint,
     ) -> Result<ResolvedBinding, EntryPointError> {
-        let slot = self
-            .per_entry_point_map
-            .as_ref()
-            .and_then(|map| map.get(&ep.name))
-            .and_then(|r| r.sizes_buffer)
-            .or_else(|| self.per_stage_map[ep.stage].sizes_buffer);
+        let slot = self.get_ep_resources(ep).sizes_buffer;
         match slot {
             Some(slot) => Ok(ResolvedBinding::Resource(BindTarget {
                 buffer: Some(slot),
@@ -378,6 +368,13 @@ impl Options {
             None => Err(EntryPointError::MissingSizesBuffer),
         }
     }
+
+    fn get_ep_resources(&self, ep: &crate::EntryPoint) -> &PerStageResources {
+        self.per_entry_point_map
+            .as_ref()
+            .and_then(|map| map.get(&ep.name))
+            .unwrap_or_else(|| &self.per_stage_map[ep.stage])
+    }
 }
 
 impl ResolvedBinding {