From f198e71806cb8cacb72eadd701d865fb7772e243 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sun, 5 Oct 2014 16:36:25 +0100 Subject: [PATCH] [Refs #87: Static Analysis] Remove unused variables --- renderdocui/Code/RenderManager.cs | 7 +------ renderdocui/Interop/CustomMarshaling.cs | 1 - renderdocui/Plugins/PluginHelpers.cs | 2 -- renderdocui/Windows/APIInspector.cs | 2 -- renderdocui/Windows/BufferViewer.cs | 3 --- renderdocui/Windows/DebugMessages.cs | 4 ---- renderdocui/Windows/Dialogs/LiveCapture.cs | 4 +--- renderdocui/Windows/Dialogs/ReplayHostManager.cs | 2 -- renderdocui/Windows/ShaderViewer.cs | 6 ++---- renderdocui/Windows/TextureViewer.cs | 8 -------- renderdocui/Windows/TimelineBar.cs | 2 -- 11 files changed, 4 insertions(+), 37 deletions(-) diff --git a/renderdocui/Code/RenderManager.cs b/renderdocui/Code/RenderManager.cs index 06b7306fb..5c8aaafdb 100644 --- a/renderdocui/Code/RenderManager.cs +++ b/renderdocui/Code/RenderManager.cs @@ -187,16 +187,11 @@ namespace renderdocui.Code if(renderer != null) { System.Diagnostics.Debug.WriteLine("Renderer created"); - - DateTime prevTime = DateTime.Now; - + Running = true; while (Running) { - DateTime curTime = DateTime.Now; - long msPassed = (curTime.Ticks - prevTime.Ticks) / TimeSpan.TicksPerMillisecond; - List queue = new List(); lock (m_renderQueue) { diff --git a/renderdocui/Interop/CustomMarshaling.cs b/renderdocui/Interop/CustomMarshaling.cs index 72fd7980c..9a9c5ae4f 100644 --- a/renderdocui/Interop/CustomMarshaling.cs +++ b/renderdocui/Interop/CustomMarshaling.cs @@ -430,7 +430,6 @@ namespace renderdoc { FieldInfo field = fields[fieldIdx]; - string name = field.Name; IntPtr fieldPtr = isUnion ? sourcePtr : OffsetPtr(structureType, fields, fieldIdx, sourcePtr); var arrayType = NonArrayType(field.FieldType); diff --git a/renderdocui/Plugins/PluginHelpers.cs b/renderdocui/Plugins/PluginHelpers.cs index cafe13a76..9b2c4ab80 100644 --- a/renderdocui/Plugins/PluginHelpers.cs +++ b/renderdocui/Plugins/PluginHelpers.cs @@ -85,8 +85,6 @@ namespace renderdocplugin var ass = m_LoadedPlugins[assemblyName]; - Type pluginType = ass.GetType(assemblyName + "." + type.Name); - return (T)ass.CreateInstance(assemblyName + "." + type.Name); } } diff --git a/renderdocui/Windows/APIInspector.cs b/renderdocui/Windows/APIInspector.cs index b98c1c622..4d4a10ad5 100644 --- a/renderdocui/Windows/APIInspector.cs +++ b/renderdocui/Windows/APIInspector.cs @@ -136,8 +136,6 @@ namespace renderdocui.Windows return; } - String[] filteredCalls = new String[calls.Length]; - /* String commonRoot = calls[0]; diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs index 455724804..c99b756b5 100644 --- a/renderdocui/Windows/BufferViewer.cs +++ b/renderdocui/Windows/BufferViewer.cs @@ -1131,7 +1131,6 @@ namespace renderdocui.Windows var state = GetUIState(type); Input input = state.m_Input; - uint instance = m_CurInst; if(data.Buffers == null) return; @@ -2220,8 +2219,6 @@ namespace renderdocui.Windows private void ShowFormatSpecifier() { - UIState ui = GetUIState(MeshDataStage.VSIn); - if (m_FormatSpecifier == null) { m_FormatSpecifier = new BufferFormatSpecifier(this, m_FormatText); diff --git a/renderdocui/Windows/DebugMessages.cs b/renderdocui/Windows/DebugMessages.cs index 7795f65f8..2e3009724 100644 --- a/renderdocui/Windows/DebugMessages.cs +++ b/renderdocui/Windows/DebugMessages.cs @@ -99,11 +99,7 @@ namespace renderdocui.Windows messages.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.DisplayedCells; for (UInt32 f = 0; f < m_Core.FrameInfo.Length; f++) - { - FetchDrawcall[] drawcalls = m_Core.GetDrawcalls(f); - AddDebugMessages(m_Core.GetDrawcalls(f)); - } messages.RowCount = m_Messages.Count; } diff --git a/renderdocui/Windows/Dialogs/LiveCapture.cs b/renderdocui/Windows/Dialogs/LiveCapture.cs index d6e440c37..6970e40ad 100644 --- a/renderdocui/Windows/Dialogs/LiveCapture.cs +++ b/renderdocui/Windows/Dialogs/LiveCapture.cs @@ -244,8 +244,6 @@ namespace renderdocui.Windows { try { - var p = Process.GetProcessById((int)m_Connection.NewChild.PID); - ChildProcess c = new ChildProcess(); c.PID = (int)m_Connection.NewChild.PID; c.ident = m_Connection.NewChild.ident; @@ -713,7 +711,7 @@ namespace renderdocui.Windows try { // if this throws an exception the process no longer exists so we'll remove it - var p = Process.GetProcessById(m_Children[i].PID); + Process.GetProcessById(m_Children[i].PID); } catch (Exception) { diff --git a/renderdocui/Windows/Dialogs/ReplayHostManager.cs b/renderdocui/Windows/Dialogs/ReplayHostManager.cs index 20c0663c2..11b707aa1 100644 --- a/renderdocui/Windows/Dialogs/ReplayHostManager.cs +++ b/renderdocui/Windows/Dialogs/ReplayHostManager.cs @@ -45,7 +45,6 @@ namespace renderdocui.Windows.Dialogs // GPU in it to check for bugs or access different hardware profiling counters public partial class ReplayHostManager : Form { - MainWindow m_Main; Core m_Core; List m_Hosts = new List(); @@ -56,7 +55,6 @@ namespace renderdocui.Windows.Dialogs Icon = global::renderdocui.Properties.Resources.icon; m_Core = core; - m_Main = main; string[] proxies = new string[0]; try diff --git a/renderdocui/Windows/ShaderViewer.cs b/renderdocui/Windows/ShaderViewer.cs index b39555ab9..e7031dd10 100644 --- a/renderdocui/Windows/ShaderViewer.cs +++ b/renderdocui/Windows/ShaderViewer.cs @@ -462,7 +462,7 @@ namespace renderdocui.Windows string name = s.varName.Length == 0 ? s.semanticName : String.Format("{0} ({1})", s.varName, s.semanticName); if (s.semanticName.Length == 0) name = s.varName; - var node = inSig.Nodes.Add(new object[] { name, s.semanticIndex, s.regIndex, s.TypeString, s.systemValue.ToString(), + inSig.Nodes.Add(new object[] { name, s.semanticIndex, s.regIndex, s.TypeString, s.systemValue.ToString(), SigParameter.GetComponentString(s.regChannelMask), SigParameter.GetComponentString(s.channelUsedMask) }); } @@ -484,7 +484,7 @@ namespace renderdocui.Windows if(multipleStreams) name = String.Format("Stream {0} : {1}", s.stream, name); - var node = outSig.Nodes.Add(new object[] { name, s.semanticIndex, s.regIndex, s.TypeString, s.systemValue.ToString(), + outSig.Nodes.Add(new object[] { name, s.semanticIndex, s.regIndex, s.TypeString, s.systemValue.ToString(), SigParameter.GetComponentString(s.regChannelMask), SigParameter.GetComponentString(s.channelUsedMask) }); } } @@ -522,8 +522,6 @@ namespace renderdocui.Windows ScintillaNET.Scintilla scintilla1 = new ScintillaNET.Scintilla(); ((System.ComponentModel.ISupportInitialize)(scintilla1)).BeginInit(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShaderViewer)); - // // scintilla1 // diff --git a/renderdocui/Windows/TextureViewer.cs b/renderdocui/Windows/TextureViewer.cs index 29477d785..795bfd179 100644 --- a/renderdocui/Windows/TextureViewer.cs +++ b/renderdocui/Windows/TextureViewer.cs @@ -2353,8 +2353,6 @@ namespace renderdocui.Windows { if (e.Button == MouseButtons.Right && sender is ToolStripButton) { - ToolStripButton me = (sender as ToolStripButton); - bool checkd = false; var butts = new ToolStripButton[] { customRed, customGreen, customBlue, customAlpha }; @@ -2592,8 +2590,6 @@ namespace renderdocui.Windows { if (tabContextMenu.SourceControl == m_PreviewPanel.Pane.TabStripControl) { - int idx = m_PreviewPanel.Pane.TabStripControl.Tabs.IndexOf(m_PreviewPanel.Pane.ActiveContent); - if (m_PreviewPanel.Pane.ActiveContent != m_PreviewPanel) { (m_PreviewPanel.Pane.ActiveContent as DockContent).Close(); @@ -2887,10 +2883,6 @@ namespace renderdocui.Windows { if (e.Button == MouseButtons.Left && sender is ResourcePreview) { - var prev = (ResourcePreview)sender; - - var follow = (Following)prev.Tag; - var id = m_Following.GetResourceId(m_Core); if (id != ResourceId.Null) diff --git a/renderdocui/Windows/TimelineBar.cs b/renderdocui/Windows/TimelineBar.cs index b047bf36c..095edba25 100644 --- a/renderdocui/Windows/TimelineBar.cs +++ b/renderdocui/Windows/TimelineBar.cs @@ -133,8 +133,6 @@ namespace renderdocui.Windows private float DrawPip(Graphics g, Color col, RectangleF rect, int type, int idx, int numChildren, float startSeg, float segWidth, string text) { - int pipPaddingX = (int)Math.Max(0, rect.Width * segWidth * 0.02f); - var subRect = GetSubrect(rect, startSeg, segWidth); subRect.X += pipRadius; subRect.Y += pipPaddingY;