From a57e08075b7e4600b890624c64de0a1458b4b986 Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Tue, 12 May 2020 11:59:33 -0700
Subject: [PATCH] diagnostics: real bind group count

---
 .../wgpu_resource_diagnostics_plugin.rs        | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs b/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs
index a4401f522b..9cb33b2043 100644
--- a/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs
+++ b/crates/bevy_wgpu/src/diagnostic/wgpu_resource_diagnostics_plugin.rs
@@ -36,9 +36,12 @@ impl WgpuResourceDiagnosticsPlugin {
     pub const SAMPLERS: DiagnosticId =
         DiagnosticId::from_u128(305855369913076220671125671543184691267);
 
-    pub const BIND_GROUPS: DiagnosticId =
+    pub const BIND_GROUP_IDS: DiagnosticId =
         DiagnosticId::from_u128(283571569334075937453357861280307923122);
 
+    pub const BIND_GROUPS: DiagnosticId =
+        DiagnosticId::from_u128(21302464753369276741568507794995836890);
+
     pub const BIND_GROUP_LAYOUTS: DiagnosticId =
         DiagnosticId::from_u128(96406067032931216377076410852598331304);
 
@@ -71,6 +74,7 @@ impl WgpuResourceDiagnosticsPlugin {
 
         diagnostics.add(Diagnostic::new(Self::SAMPLERS, "samplers", 10));
 
+        diagnostics.add(Diagnostic::new(Self::BIND_GROUP_IDS, "bind_group_ids", 10));
         diagnostics.add(Diagnostic::new(Self::BIND_GROUPS, "bind_groups", 10));
 
         diagnostics.add(Diagnostic::new(
@@ -168,7 +172,7 @@ impl WgpuResourceDiagnosticsPlugin {
         );
 
         diagnostics.add_measurement(
-            Self::BIND_GROUPS,
+            Self::BIND_GROUP_IDS,
             render_resource_context
                 .resources
                 .bind_groups
@@ -177,6 +181,16 @@ impl WgpuResourceDiagnosticsPlugin {
                 .len() as f64,
         );
 
+        let mut bind_group_count = 0;
+        for bind_group in render_resource_context.resources.bind_groups.read().unwrap().values() {
+            bind_group_count += bind_group.bind_groups.len();
+        }
+
+        diagnostics.add_measurement(
+            Self::BIND_GROUPS,
+            bind_group_count as f64,
+        );
+
         diagnostics.add_measurement(
             Self::BIND_GROUP_LAYOUTS,
             render_resource_context