From d4ff92755a8c55b302f7b1ec516195716a77e6d5 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 24 Jun 2016 12:14:22 +0200
Subject: [PATCH] Display multisample count for MSAA textures in states

---
 .../PipelineState/D3D11PipelineStateViewer.cs | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs b/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs
index 932400aef..d5fac56e5 100644
--- a/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs
+++ b/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs
@@ -313,6 +313,12 @@ namespace renderdocui.Windows.PipelineState
                                 name = texs[t].name;
                                 typename = texs[t].resType.Str();
 
+                                if (texs[t].resType == ShaderResourceType.Texture2DMS ||
+                                    texs[t].resType == ShaderResourceType.Texture2DMSArray)
+                                {
+                                    typename += String.Format(" {0}x", texs[t].msSamp);
+                                }
+
                                 // if it's a typeless format, show the format of the view
                                 if (texs[t].format.compType == FormatComponentType.None)
                                 {
@@ -1020,6 +1026,12 @@ namespace renderdocui.Windows.PipelineState
                                 name = texs[t].name;
                                 typename = texs[t].resType.Str();
 
+                                if (texs[t].resType == ShaderResourceType.Texture2DMS ||
+                                    texs[t].resType == ShaderResourceType.Texture2DMSArray)
+                                {
+                                    typename += String.Format(" {0}x", texs[t].msSamp);
+                                }
+
                                 // if it's a typeless format, show the format of the view
                                 if (texs[t].format.compType == FormatComponentType.None)
                                 {
@@ -1277,6 +1289,12 @@ namespace renderdocui.Windows.PipelineState
                                 name = texs[t].name;
                                 typename = texs[t].resType.Str();
 
+                                if (texs[t].resType == ShaderResourceType.Texture2DMS ||
+                                    texs[t].resType == ShaderResourceType.Texture2DMSArray)
+                                {
+                                    typename += String.Format(" {0}x", texs[t].msSamp);
+                                }
+
                                 // if it's a typeless format, show the format of the view
                                 if (texs[t].format.compType == FormatComponentType.None)
                                 {
@@ -1363,6 +1381,12 @@ namespace renderdocui.Windows.PipelineState
                                 name = texs[t].name;
                                 typename = texs[t].resType.Str();
 
+                                if (texs[t].resType == ShaderResourceType.Texture2DMS ||
+                                    texs[t].resType == ShaderResourceType.Texture2DMSArray)
+                                {
+                                    typename += String.Format(" {0}x", texs[t].msSamp);
+                                }
+
                                 // if it's a typeless format, show the format of the view
                                 if (texs[t].format.compType == FormatComponentType.None)
                                 {
@@ -1461,6 +1485,12 @@ namespace renderdocui.Windows.PipelineState
                         name = texs[t].name;
                         typename = texs[t].resType.Str();
 
+                        if (texs[t].resType == ShaderResourceType.Texture2DMS ||
+                            texs[t].resType == ShaderResourceType.Texture2DMSArray)
+                        {
+                            typename += String.Format(" {0}x", texs[t].msSamp);
+                        }
+
                         // if it's a typeless format, show the format of the view
                         if (texs[t].format.compType == FormatComponentType.None)
                         {