From 6535e7e43ae246e27204656c2e7c1438ec17ed1b Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Fri, 28 Apr 2023 15:32:07 +1000
Subject: [PATCH] GS: Add natvis for vector types

---
 pcsx2/GS/GS.natvis                          | 36 +++++++++++++++++++++
 pcsx2/GS/Renderers/Common/GSFastList.natvis | 20 ------------
 pcsx2/GS/Renderers/HW/GSTextureCache.natvis |  7 ----
 pcsx2/pcsx2core.vcxproj                     |  3 +-
 pcsx2/pcsx2core.vcxproj.filters             |  5 +--
 5 files changed, 38 insertions(+), 33 deletions(-)
 create mode 100644 pcsx2/GS/GS.natvis
 delete mode 100644 pcsx2/GS/Renderers/Common/GSFastList.natvis
 delete mode 100644 pcsx2/GS/Renderers/HW/GSTextureCache.natvis

diff --git a/pcsx2/GS/GS.natvis b/pcsx2/GS/GS.natvis
new file mode 100644
index 0000000000..8e1f66222a
--- /dev/null
+++ b/pcsx2/GS/GS.natvis
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+	<Type Name="FastList&lt;*&gt;">
+		<DisplayString>{{ size={m_free_indexes_stack_top} }}</DisplayString>
+		<Expand>
+			<Item Name="[size]" ExcludeView="simple">m_free_indexes_stack_top</Item>
+			<Item Name="[capacity]" ExcludeView="simple">m_capacity - 1</Item>
+
+			<CustomListItems MaxItemsPerView="5000" ExcludeView="simple">
+				<Variable Name="index" InitialValue="m_buffer[0].next_index" />
+
+				<Size>m_free_indexes_stack_top</Size>
+				<Loop>
+					<Item>m_buffer[index].data,na</Item>
+					<Exec>index = m_buffer[index].next_index</Exec>
+				</Loop>
+			</CustomListItems>
+		</Expand>
+	</Type>
+
+	<Type Name="GSVector2T&lt;*&gt;">
+		<DisplayString>{{ {x}, {y} }}</DisplayString>
+	</Type>
+
+	<Type Name="GSVector4">
+		<DisplayString>{{ {F32[0]}, {F32[1]}, {F32[2]}, {F32[3]} }}</DisplayString>
+	</Type>
+	<Type Name="GSVector4i">
+		<DisplayString>{{ {I32[0]}, {I32[1]}, {I32[2]}, {I32[3]} }}</DisplayString>
+	</Type>
+
+	<Type Name="GSTextureCache::Target">
+		<DisplayString Condition="m_type == 0">{{ RT @ BP={m_TEX0.TBP0,X}-{m_end_block,X} BW={m_TEX0.TBW} PSM={m_TEX0.PSM,X} {m_unscaled_size.x}x{m_unscaled_size.y} {m_valid.z},{m_valid.w} }}</DisplayString>
+		<DisplayString Condition="m_type == 1">{{ Depth @ BP={m_TEX0.TBP0,X}-{m_end_block,X} BW={m_TEX0.TBW} PSM={m_TEX0.PSM,X} {m_unscaled_size.x}x{m_unscaled_size.y} {m_valid.z},{m_valid.w} }}</DisplayString>
+	</Type>
+</AutoVisualizer>
diff --git a/pcsx2/GS/Renderers/Common/GSFastList.natvis b/pcsx2/GS/Renderers/Common/GSFastList.natvis
deleted file mode 100644
index ea7646461b..0000000000
--- a/pcsx2/GS/Renderers/Common/GSFastList.natvis
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-	<Type Name="FastList&lt;*&gt;">
-		<DisplayString>{{ size={m_free_indexes_stack_top} }}</DisplayString>
-		<Expand>
-			<Item Name="[size]" ExcludeView="simple">m_free_indexes_stack_top</Item>
-			<Item Name="[capacity]" ExcludeView="simple">m_capacity - 1</Item>
-
-			<CustomListItems MaxItemsPerView="5000" ExcludeView="simple">
-				<Variable Name="index" InitialValue="m_buffer[0].next_index" />
-
-				<Size>m_free_indexes_stack_top</Size>
-				<Loop>
-					<Item>m_buffer[index].data,na</Item>
-					<Exec>index = m_buffer[index].next_index</Exec>
-				</Loop>
-			</CustomListItems>
-		</Expand>
-	</Type>
-</AutoVisualizer>
diff --git a/pcsx2/GS/Renderers/HW/GSTextureCache.natvis b/pcsx2/GS/Renderers/HW/GSTextureCache.natvis
deleted file mode 100644
index 01dd922e71..0000000000
--- a/pcsx2/GS/Renderers/HW/GSTextureCache.natvis
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-	<Type Name="GSTextureCache::Target">
-		<DisplayString Condition="m_type == 0">{{ RT @ BP={m_TEX0.TBP0,X}-{m_end_block,X} BW={m_TEX0.TBW} PSM={m_TEX0.PSM,X} {m_unscaled_size.x}x{m_unscaled_size.y} {m_valid.z},{m_valid.w} }}</DisplayString>
-		<DisplayString Condition="m_type == 1">{{ Depth @ BP={m_TEX0.TBP0,X}-{m_end_block,X} BW={m_TEX0.TBW} PSM={m_TEX0.PSM,X} {m_unscaled_size.x}x{m_unscaled_size.y} {m_valid.z},{m_valid.w} }}</DisplayString>
-	</Type>
-</AutoVisualizer>
diff --git a/pcsx2/pcsx2core.vcxproj b/pcsx2/pcsx2core.vcxproj
index 5bb65a0a06..c39a5f564a 100644
--- a/pcsx2/pcsx2core.vcxproj
+++ b/pcsx2/pcsx2core.vcxproj
@@ -853,8 +853,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Natvis Include="GS\Renderers\Common\GSFastList.natvis" />
-    <Natvis Include="GS\Renderers\HW\GSTextureCache.natvis" />
+    <Natvis Include="GS\GS.natvis" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
diff --git a/pcsx2/pcsx2core.vcxproj.filters b/pcsx2/pcsx2core.vcxproj.filters
index 8e2b59cae3..73ac9d7e3a 100644
--- a/pcsx2/pcsx2core.vcxproj.filters
+++ b/pcsx2/pcsx2core.vcxproj.filters
@@ -2283,11 +2283,8 @@
     </CustomBuildStep>
   </ItemGroup>
   <ItemGroup>
-    <Natvis Include="GS\Renderers\Common\GSFastList.natvis">
+    <Natvis Include="GS\GS.natvis">
       <Filter>System\Ps2\GS</Filter>
     </Natvis>
-    <Natvis Include="GS\Renderers\HW\GSTextureCache.natvis">
-      <Filter>System\Ps2\GS\Renderers\Hardware</Filter>
-    </Natvis>
   </ItemGroup>
 </Project>
\ No newline at end of file