From ea16651793f62746cc02c6c6f682d24fc7d6a7ce Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvarkus@gmail.com>
Date: Tue, 19 Jan 2021 22:01:54 -0500
Subject: [PATCH] [rs] Remove typed-arena dependency

---
 wgpu/Cargo.toml            |  7 +++----
 wgpu/src/backend/direct.rs | 31 ++++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index b9279c7a02..d244d75d0d 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -26,20 +26,20 @@ webgl = ["wgc"]
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "4f2d0bb8c87d9de284e2abf96e07dc159c310037"
+rev = "7c9e239a2400fab89fcf905ac42be0360224a522"
 features = ["raw-window-handle"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "4f2d0bb8c87d9de284e2abf96e07dc159c310037"
+rev = "7c9e239a2400fab89fcf905ac42be0360224a522"
 features = ["raw-window-handle"]
 optional = true
 
 [dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "4f2d0bb8c87d9de284e2abf96e07dc159c310037"
+rev = "7c9e239a2400fab89fcf905ac42be0360224a522"
 
 [dependencies]
 arrayvec = "0.5"
@@ -47,7 +47,6 @@ parking_lot = "0.11"
 raw-window-handle = "0.3"
 smallvec = "1"
 tracing = { version = "0.1", default-features = false, features = ["std"] }
-typed-arena = "2.0.1"
 serde = { version = "1", features = ["derive"], optional = true }
 
 [dev-dependencies]
diff --git a/wgpu/src/backend/direct.rs b/wgpu/src/backend/direct.rs
index dd96680a6a..507426e6c2 100644
--- a/wgpu/src/backend/direct.rs
+++ b/wgpu/src/backend/direct.rs
@@ -20,7 +20,6 @@ use std::{
     slice,
     sync::Arc,
 };
-use typed_arena::Arena;
 
 const LABEL: &str = "label";
 
@@ -608,6 +607,7 @@ fn map_pass_channel<V: Copy + Default>(
 pub(crate) struct Device {
     id: wgc::id::DeviceId,
     error_sink: ErrorSink,
+    features: Features,
 }
 
 #[derive(Debug)]
@@ -707,6 +707,7 @@ impl crate::Context for Context {
         let device = Device {
             id: device_id,
             error_sink: Arc::new(Mutex::new(ErrorSinkRaw::new())),
+            features: desc.features,
         };
         ready(Ok((device, device_id)))
     }
@@ -867,7 +868,23 @@ impl crate::Context for Context {
         wgc::span!(_guard, TRACE, "Device::create_bind_group wrapper");
         use wgc::binding_model as bm;
 
-        let texture_view_arena: Arena<wgc::id::TextureViewId> = Arena::new();
+        let mut arrayed_texture_views = Vec::new();
+        if device
+            .features
+            .contains(Features::SAMPLED_TEXTURE_BINDING_ARRAY)
+        {
+            // gather all the array view IDs first
+            for entry in desc.entries.iter() {
+                match entry.resource {
+                    BindingResource::TextureViewArray(array) => {
+                        arrayed_texture_views.extend(array.iter().map(|view| view.id));
+                    }
+                    _ => {}
+                }
+            }
+        }
+        let mut remaining_arrayed_texture_views = &arrayed_texture_views[..];
+
         let entries = desc
             .entries
             .iter()
@@ -887,11 +904,11 @@ impl crate::Context for Context {
                     BindingResource::TextureView(texture_view) => {
                         bm::BindingResource::TextureView(texture_view.id)
                     }
-                    BindingResource::TextureViewArray(texture_view_array) => {
-                        bm::BindingResource::TextureViewArray(Borrowed(
-                            texture_view_arena
-                                .alloc_extend(texture_view_array.iter().map(|view| view.id)),
-                        ))
+                    BindingResource::TextureViewArray(array) => {
+                        let slice = &remaining_arrayed_texture_views[..array.len()];
+                        remaining_arrayed_texture_views =
+                            &remaining_arrayed_texture_views[array.len()..];
+                        bm::BindingResource::TextureViewArray(Borrowed(slice))
                     }
                 },
             })