From c615ae102d2691314aeeb7adffb10b820430d129 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 20 Feb 2017 17:28:22 +0000
Subject: [PATCH] Remove namespace clash between D3D and GL struct names

---
 renderdoc/driver/d3d11/d3d11_counters.cpp | 6 +++---
 renderdoc/driver/d3d11/d3d11_debug.h      | 4 ++--
 renderdoc/driver/gl/gl_counters.cpp       | 6 +++---
 renderdoc/driver/gl/gl_replay.h           | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/renderdoc/driver/d3d11/d3d11_counters.cpp b/renderdoc/driver/d3d11/d3d11_counters.cpp
index e7b5c48cb..70fe3427c 100644
--- a/renderdoc/driver/d3d11/d3d11_counters.cpp
+++ b/renderdoc/driver/d3d11/d3d11_counters.cpp
@@ -183,14 +183,14 @@ struct GPUTimer
   uint32_t eventID;
 };
 
-struct CounterContext
+struct D3D11CounterContext
 {
   uint32_t eventStart;
   vector<GPUTimer> timers;
   int reuseIdx;
 };
 
-void D3D11DebugManager::FillTimers(CounterContext &ctx, const DrawcallTreeNode &drawnode)
+void D3D11DebugManager::FillTimers(D3D11CounterContext &ctx, const DrawcallTreeNode &drawnode)
 {
   const D3D11_QUERY_DESC qtimedesc = {D3D11_QUERY_TIMESTAMP, 0};
   const D3D11_QUERY_DESC qstatsdesc = {D3D11_QUERY_PIPELINE_STATISTICS, 0};
@@ -291,7 +291,7 @@ vector<CounterResult> D3D11DebugManager::FetchCounters(const vector<uint32_t> &c
     return ret;
   }
 
-  CounterContext ctx;
+  D3D11CounterContext ctx;
 
   for(int loop = 0; loop < 1; loop++)
   {
diff --git a/renderdoc/driver/d3d11/d3d11_debug.h b/renderdoc/driver/d3d11/d3d11_debug.h
index 834082e77..32bd9398b 100644
--- a/renderdoc/driver/d3d11/d3d11_debug.h
+++ b/renderdoc/driver/d3d11/d3d11_debug.h
@@ -44,7 +44,7 @@ class WrappedID3D11DeviceContext;
 
 struct DrawcallTreeNode;
 
-struct CounterContext;
+struct D3D11CounterContext;
 
 class D3D11ResourceManager;
 
@@ -591,7 +591,7 @@ private:
   // called before the device is shutdown, to shutdown any counters
   void PreDeviceShutdownCounters();
 
-  void FillTimers(CounterContext &ctx, const DrawcallTreeNode &drawnode);
+  void FillTimers(D3D11CounterContext &ctx, const DrawcallTreeNode &drawnode);
 
   void FillCBuffer(ID3D11Buffer *buf, const void *data, size_t size);
 };
diff --git a/renderdoc/driver/gl/gl_counters.cpp b/renderdoc/driver/gl/gl_counters.cpp
index 2fe0b000d..a394f81ee 100644
--- a/renderdoc/driver/gl/gl_counters.cpp
+++ b/renderdoc/driver/gl/gl_counters.cpp
@@ -177,7 +177,7 @@ struct GPUQueries
   uint32_t eventID;
 };
 
-struct CounterContext
+struct GLCounterContext
 {
   uint32_t eventStart;
   vector<GPUQueries> queries;
@@ -201,7 +201,7 @@ GLenum glCounters[] = {
     eGL_COMPUTE_SHADER_INVOCATIONS_ARB             // eCounter_CSInvocations
 };
 
-void GLReplay::FillTimers(CounterContext &ctx, const DrawcallTreeNode &drawnode,
+void GLReplay::FillTimers(GLCounterContext &ctx, const DrawcallTreeNode &drawnode,
                           const vector<uint32_t> &counters)
 {
   if(drawnode.children.empty())
@@ -276,7 +276,7 @@ vector<CounterResult> GLReplay::FetchCounters(const vector<uint32_t> &counters)
 
   MakeCurrentReplayContext(&m_ReplayCtx);
 
-  CounterContext ctx;
+  GLCounterContext ctx;
 
   for(int loop = 0; loop < 1; loop++)
   {
diff --git a/renderdoc/driver/gl/gl_replay.h b/renderdoc/driver/gl/gl_replay.h
index bf217bf09..5a4ffbdb4 100644
--- a/renderdoc/driver/gl/gl_replay.h
+++ b/renderdoc/driver/gl/gl_replay.h
@@ -34,7 +34,7 @@ using std::pair;
 using std::map;
 
 class WrappedOpenGL;
-struct CounterContext;
+struct GLCounterContext;
 struct DrawcallTreeNode;
 
 struct GLPostVSData
@@ -385,7 +385,7 @@ private:
   // called before the context is destroyed, to shutdown any counters
   void PreContextShutdownCounters();
 
-  void FillTimers(CounterContext &ctx, const DrawcallTreeNode &drawnode,
+  void FillTimers(GLCounterContext &ctx, const DrawcallTreeNode &drawnode,
                   const vector<uint32_t> &counters);
 
   GLuint CreateShaderProgram(const vector<string> &vs, const vector<string> &fs,