From bfac1c73f09379ddb67b852aa7464a94d647b384 Mon Sep 17 00:00:00 2001
From: Scott Mansell <phiren@gmail.com>
Date: Fri, 30 Oct 2015 12:30:22 +1300
Subject: [PATCH] Bitfield: Add .natvis for easier debugging in Visual Studio

---
 Source/Core/Common/BitField.natvis        | 11 +++++++++++
 Source/Core/Common/Common.vcxproj         |  5 ++++-
 Source/Core/Common/Common.vcxproj.filters |  7 ++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 Source/Core/Common/BitField.natvis

diff --git a/Source/Core/Common/BitField.natvis b/Source/Core/Common/BitField.natvis
new file mode 100644
index 0000000000..5d09eeef0a
--- /dev/null
+++ b/Source/Core/Common/BitField.natvis
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+  <Type Name="BitField&lt;*,*,*&gt;">
+    <DisplayString Condition="$T2 == 1">{(storage &amp; (1 &lt;&lt; $T1)) != 0}</DisplayString>
+    <DisplayString>{(storage &gt;&gt; $T1) &amp; ((1 &lt;&lt; $T2) - 1)}</DisplayString>
+    <Expand>
+      <Item Name="Offset">$T1</Item>
+      <Item Name="Size">$T2</Item>
+    </Expand>
+  </Type>
+</AutoVisualizer>
\ No newline at end of file
diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj
index 85a9a47eb7..f92679a1b6 100644
--- a/Source/Core/Common/Common.vcxproj
+++ b/Source/Core/Common/Common.vcxproj
@@ -187,7 +187,10 @@
       <Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="BitField.natvis" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters
index af926981f3..e708d237dd 100644
--- a/Source/Core/Common/Common.vcxproj.filters
+++ b/Source/Core/Common/Common.vcxproj.filters
@@ -189,6 +189,8 @@
     <ClInclude Include="GL\GLInterfaceBase.h">
       <Filter>GL\GLInterface</Filter>
     </ClInclude>
+    <ClInclude Include="Assert.h" />
+    <ClInclude Include="NonCopyable.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BreakPoints.cpp" />
@@ -253,4 +255,7 @@
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <Natvis Include="BitField.natvis" />
+  </ItemGroup>
+</Project>
\ No newline at end of file