From 45ade807cc1d5c9b26ac586348eed00264c4b0f3 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvarkus@gmail.com>
Date: Mon, 5 Oct 2020 14:40:34 -0400
Subject: [PATCH] Only request features that are needed

---
 wgpu-core/src/instance.rs | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/wgpu-core/src/instance.rs b/wgpu-core/src/instance.rs
index e683de48a0..515024ffc0 100644
--- a/wgpu-core/src/instance.rs
+++ b/wgpu-core/src/instance.rs
@@ -659,7 +659,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
             let mut enabled_features = available_features & wishful_features;
             if enabled_features != wishful_features {
                 tracing::warn!(
-                    "Missing features: {:?}",
+                    "Missing internal features: {:?}",
                     wishful_features - enabled_features
                 );
             }
@@ -667,38 +667,30 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
             // Features
             enabled_features.set(
                 hal::Features::TEXTURE_DESCRIPTOR_ARRAY,
-                adapter
-                    .features
+                desc.features
                     .contains(wgt::Features::SAMPLED_TEXTURE_BINDING_ARRAY),
             );
             enabled_features.set(
                 hal::Features::SHADER_SAMPLED_IMAGE_ARRAY_DYNAMIC_INDEXING,
-                adapter
-                    .features
+                desc.features
                     .contains(wgt::Features::SAMPLED_TEXTURE_ARRAY_DYNAMIC_INDEXING),
             );
             enabled_features.set(
                 hal::Features::SAMPLED_TEXTURE_DESCRIPTOR_INDEXING,
-                adapter
-                    .features
+                desc.features
                     .contains(wgt::Features::SAMPLED_TEXTURE_ARRAY_NON_UNIFORM_INDEXING),
             );
             enabled_features.set(
                 hal::Features::UNSIZED_DESCRIPTOR_ARRAY,
-                adapter
-                    .features
-                    .contains(wgt::Features::UNSIZED_BINDING_ARRAY),
+                desc.features.contains(wgt::Features::UNSIZED_BINDING_ARRAY),
             );
             enabled_features.set(
                 hal::Features::MULTI_DRAW_INDIRECT,
-                adapter
-                    .features
-                    .contains(wgt::Features::MULTI_DRAW_INDIRECT),
+                desc.features.contains(wgt::Features::MULTI_DRAW_INDIRECT),
             );
             enabled_features.set(
                 hal::Features::DRAW_INDIRECT_COUNT,
-                adapter
-                    .features
+                desc.features
                     .contains(wgt::Features::MULTI_DRAW_INDIRECT_COUNT),
             );