From 9042aeab39d88b20264f1a9e5b2ecf3c653492af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <marcin.slusarz@intel.com>
Date: Thu, 16 Jul 2020 13:16:09 +0200
Subject: [PATCH] Don't hide counters belonging to multiple Intel queries.

Many counters are exposed in multiple queries. By hiding that fact,
we are making life harder for users, because they need to find
related counters all around the query tree. Don't do that.

As a side effect this will decrease the number of needed passes if
all selected counters belong to the same query.
---
 renderdoc/driver/ihv/intel/intel_gl_counters.cpp | 4 ----
 renderdoc/driver/ihv/intel/intel_gl_counters.h   | 1 -
 2 files changed, 5 deletions(-)

diff --git a/renderdoc/driver/ihv/intel/intel_gl_counters.cpp b/renderdoc/driver/ihv/intel/intel_gl_counters.cpp
index d2eb657d8..e1ce3dc97 100644
--- a/renderdoc/driver/ihv/intel/intel_gl_counters.cpp
+++ b/renderdoc/driver/ihv/intel/intel_gl_counters.cpp
@@ -96,9 +96,6 @@ void IntelGlCounters::addCounter(const IntelGlQuery &query, GLuint counterId)
   counter.desc.name.resize(strlen(&counter.desc.name[0]));
   counter.desc.description.resize(strlen(&counter.desc.description[0]));
 
-  if(m_CounterNames.find(counter.desc.name) != m_CounterNames.end())
-    return;
-
   uint32_t query_hash = strhash(query.name.c_str());
   uint32_t name_hash = strhash(counter.desc.name.c_str());
   uint32_t desc_hash = strhash(counter.desc.description.c_str());
@@ -107,7 +104,6 @@ void IntelGlCounters::addCounter(const IntelGlQuery &query, GLuint counterId)
   counter.desc.unit = CounterUnit::Absolute;
 
   m_Counters.push_back(counter);
-  m_CounterNames[counter.desc.name] = counter;
 }
 
 void IntelGlCounters::addQuery(GLuint queryId)
diff --git a/renderdoc/driver/ihv/intel/intel_gl_counters.h b/renderdoc/driver/ihv/intel/intel_gl_counters.h
index 874689e2a..129c00748 100644
--- a/renderdoc/driver/ihv/intel/intel_gl_counters.h
+++ b/renderdoc/driver/ihv/intel/intel_gl_counters.h
@@ -79,7 +79,6 @@ private:
     GLuint dataType = 0;
   };
   rdcarray<IntelGlCounter> m_Counters;
-  std::map<rdcstr, IntelGlCounter> m_CounterNames;
 
   struct IntelGlQuery
   {