From 95f4011bcbd1277057d6fbad58939b9fe854b44f Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 9 Apr 2015 21:49:03 +0100 Subject: [PATCH] Add option to favour monospaced font for all data. Refs #118 * The option will enable monospaced fonts for all data displays, like the list of events, API calls, etc as well as pipeline displays, entry of filename/directory in the capture window and many other places. Pure UI labelling etc mostly still stays as a serif font. * A few sizes of controls were tweaked (like headers in the pipeline windows) so that they didn't just barely overflow with the larger font. * While looking at this, it became obvious that buffer viewers and constant bufferviewers should always display in monospaced regardless, so that has been changed. --- renderdocui/Code/AppMain.cs | 2 +- renderdocui/Code/PersistantConfig.cs | 15 +- renderdocui/Controls/ResourcePreview.cs | 2 + renderdocui/Interop/Enums.cs | 20 + renderdocui/Windows/APIInspector.cs | 4 + renderdocui/Windows/BufferViewer.Designer.cs | 149 ++-- renderdocui/Windows/BufferViewer.cs | 28 +- renderdocui/Windows/DebugMessages.cs | 2 + renderdocui/Windows/Dialogs/CaptureDialog.cs | 6 + .../ConstantBufferPreviewer.Designer.cs | 9 +- .../Windows/Dialogs/RemoteHostSelect.cs | 4 + .../Windows/Dialogs/ReplayHostManager.cs | 4 + .../Dialogs/SettingsDialog.Designer.cs | 113 +-- renderdocui/Windows/Dialogs/SettingsDialog.cs | 12 +- .../Windows/Dialogs/SettingsDialog.resx | 27 + .../Windows/Dialogs/TextureSaveDialog.cs | 13 +- renderdocui/Windows/EventBrowser.cs | 5 + .../D3D11PipelineStateViewer.Designer.cs | 176 ++--- .../PipelineState/D3D11PipelineStateViewer.cs | 35 +- .../GLPipelineStateViewer.Designer.cs | 641 +++++++++--------- .../PipelineState/GLPipelineStateViewer.cs | 53 +- renderdocui/Windows/PixelHistoryView.cs | 3 + renderdocui/Windows/ShaderViewer.Designer.cs | 290 ++++---- renderdocui/Windows/ShaderViewer.cs | 21 + renderdocui/Windows/ShaderViewer.resx | 3 - renderdocui/Windows/TextureViewer.cs | 14 +- 26 files changed, 967 insertions(+), 684 deletions(-) diff --git a/renderdocui/Code/AppMain.cs b/renderdocui/Code/AppMain.cs index 87b68300f..5e851fb99 100644 --- a/renderdocui/Code/AppMain.cs +++ b/renderdocui/Code/AppMain.cs @@ -130,7 +130,7 @@ namespace renderdocui.Code } // propogate float formatting settings to the Formatter class used globally to format float values - cfg.SetupFormatter(); + cfg.SetupFormatting(); Application.CurrentCulture = new System.Globalization.CultureInfo("en-GB"); diff --git a/renderdocui/Code/PersistantConfig.cs b/renderdocui/Code/PersistantConfig.cs index 57f9866c2..48d363a7e 100644 --- a/renderdocui/Code/PersistantConfig.cs +++ b/renderdocui/Code/PersistantConfig.cs @@ -91,6 +91,15 @@ namespace renderdocui.Code public int Formatter_NegExp = 5; public int Formatter_PosExp = 7; + public bool Font_PreferMonospaced = false; + + [XmlIgnore] // not directly serializable + public System.Drawing.Font PreferredFont + { + get; + private set; + } + public bool CheckUpdate_AllowChecks = true; public bool CheckUpdate_UpdateAvailable = false; public DateTime CheckUpdate_LastUpdate = new DateTime(2012, 06, 27); @@ -99,12 +108,16 @@ namespace renderdocui.Code public bool AllowGlobalHook = false; - public void SetupFormatter() + public void SetupFormatting() { Formatter.MinFigures = Formatter_MinFigures; Formatter.MaxFigures = Formatter_MaxFigures; Formatter.ExponentialNegCutoff = Formatter_NegExp; Formatter.ExponentialPosCutoff = Formatter_PosExp; + + PreferredFont = Font_PreferMonospaced + ? new System.Drawing.Font("Consolas", 9.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))) + : new System.Drawing.Font("Tahoma", 8.25F); } public void AddRecentFile(List recentList, string file, int maxItems) diff --git a/renderdocui/Controls/ResourcePreview.cs b/renderdocui/Controls/ResourcePreview.cs index ae5a2ecb4..6621d3f69 100644 --- a/renderdocui/Controls/ResourcePreview.cs +++ b/renderdocui/Controls/ResourcePreview.cs @@ -49,6 +49,8 @@ namespace renderdocui.Controls { InitializeComponent(); + descriptionLabel.Font = core.Config.PreferredFont; + m_Name = "Unbound"; m_Width = 1; m_Height = 1; diff --git a/renderdocui/Interop/Enums.cs b/renderdocui/Interop/Enums.cs index c93ab4ef7..a645fc53e 100644 --- a/renderdocui/Interop/Enums.cs +++ b/renderdocui/Interop/Enums.cs @@ -540,7 +540,27 @@ namespace renderdoc return "Unknown"; } + + public static string Str(this ShaderResourceType type) + { + switch (type) + { + case ShaderResourceType.None: return "None"; + case ShaderResourceType.Buffer: return "Buffer"; + case ShaderResourceType.Texture1D: return "1D"; + case ShaderResourceType.Texture1DArray: return "1D Array"; + case ShaderResourceType.Texture2D: return "2D"; + case ShaderResourceType.TextureRect: return "Rect"; + case ShaderResourceType.Texture2DArray: return "2D Array"; + case ShaderResourceType.Texture2DMS: return "2D MS"; + case ShaderResourceType.Texture2DMSArray: return "2D MS Array"; + case ShaderResourceType.Texture3D: return "3D"; + case ShaderResourceType.TextureCube: return "Cube"; + case ShaderResourceType.TextureCubeArray: return "Cube Array"; + } + return "Unknown resource type"; + } public static string Str(this ResourceUsage usage) { switch (usage) diff --git a/renderdocui/Windows/APIInspector.cs b/renderdocui/Windows/APIInspector.cs index d204f075a..a841ba524 100644 --- a/renderdocui/Windows/APIInspector.cs +++ b/renderdocui/Windows/APIInspector.cs @@ -53,6 +53,10 @@ namespace renderdocui.Windows m_Core = core; + callstack.Font = + apiEvents.Font = + core.Config.PreferredFont; + panelSplitter.Collapsed = true; } diff --git a/renderdocui/Windows/BufferViewer.Designer.cs b/renderdocui/Windows/BufferViewer.Designer.cs index 32b6e60c0..46f09809e 100644 --- a/renderdocui/Windows/BufferViewer.Designer.cs +++ b/renderdocui/Windows/BufferViewer.Designer.cs @@ -35,21 +35,24 @@ System.Windows.Forms.Label label3; System.Windows.Forms.Label label5; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BufferViewer)); - WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); - WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin3 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); + WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin3 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient7 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient15 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient16 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient8 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient17 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient18 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient19 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient9 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient20 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient21 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); this.previewTable = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.render = new renderdocui.Controls.NoScrollPanel(); @@ -619,6 +622,14 @@ this.vsInBufferView.AllowUserToResizeRows = false; this.vsInBufferView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells; this.vsInBufferView.BackgroundColor = System.Drawing.Color.White; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle7.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.vsInBufferView.DefaultCellStyle = dataGridViewCellStyle7; this.vsInBufferView.Location = new System.Drawing.Point(12, 41); this.vsInBufferView.Name = "vsInBufferView"; this.vsInBufferView.ReadOnly = true; @@ -658,6 +669,14 @@ this.vsOutBufferView.AllowUserToResizeRows = false; this.vsOutBufferView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells; this.vsOutBufferView.BackgroundColor = System.Drawing.Color.White; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle8.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.vsOutBufferView.DefaultCellStyle = dataGridViewCellStyle8; this.vsOutBufferView.Location = new System.Drawing.Point(264, 40); this.vsOutBufferView.Name = "vsOutBufferView"; this.vsOutBufferView.ReadOnly = true; @@ -688,52 +707,52 @@ this.dockPanel.Location = new System.Drawing.Point(3, 34); this.dockPanel.Name = "dockPanel"; this.dockPanel.Size = new System.Drawing.Size(834, 462); - dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight; - autoHideStripSkin1.DockStripGradient = dockPanelGradient1; - tabGradient1.EndColor = System.Drawing.SystemColors.Control; - tabGradient1.StartColor = System.Drawing.SystemColors.Control; - tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark; - autoHideStripSkin1.TabGradient = tabGradient1; - autoHideStripSkin1.TextFont = new System.Drawing.Font("Tahoma", 8.25F); - dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; - tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient1.ActiveTabGradient = tabGradient2; - dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; - dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control; - dockPaneStripGradient1.DockStripGradient = dockPanelGradient2; - tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight; - tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight; - tabGradient3.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient1.InactiveTabGradient = tabGradient3; - dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1; - dockPaneStripSkin1.TextFont = new System.Drawing.Font("Tahoma", 8.25F); - tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption; - tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption; - tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText; - dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4; - tabGradient5.EndColor = System.Drawing.SystemColors.Control; - tabGradient5.StartColor = System.Drawing.SystemColors.Control; - tabGradient5.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5; - dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight; - dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3; - tabGradient6.EndColor = System.Drawing.SystemColors.InactiveCaption; - tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient6.TextColor = System.Drawing.SystemColors.InactiveCaptionText; - dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6; - tabGradient7.EndColor = System.Drawing.Color.Transparent; - tabGradient7.StartColor = System.Drawing.Color.Transparent; - tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark; - dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7; - dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1; - dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; - this.dockPanel.Skin = dockPanelSkin1; + dockPanelGradient7.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient7.StartColor = System.Drawing.SystemColors.ControlLight; + autoHideStripSkin3.DockStripGradient = dockPanelGradient7; + tabGradient15.EndColor = System.Drawing.SystemColors.Control; + tabGradient15.StartColor = System.Drawing.SystemColors.Control; + tabGradient15.TextColor = System.Drawing.SystemColors.ControlDarkDark; + autoHideStripSkin3.TabGradient = tabGradient15; + autoHideStripSkin3.TextFont = new System.Drawing.Font("Tahoma", 8.25F); + dockPanelSkin3.AutoHideStripSkin = autoHideStripSkin3; + tabGradient16.EndColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient16.StartColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient16.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient3.ActiveTabGradient = tabGradient16; + dockPanelGradient8.EndColor = System.Drawing.SystemColors.Control; + dockPanelGradient8.StartColor = System.Drawing.SystemColors.Control; + dockPaneStripGradient3.DockStripGradient = dockPanelGradient8; + tabGradient17.EndColor = System.Drawing.SystemColors.ControlLight; + tabGradient17.StartColor = System.Drawing.SystemColors.ControlLight; + tabGradient17.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient3.InactiveTabGradient = tabGradient17; + dockPaneStripSkin3.DocumentGradient = dockPaneStripGradient3; + dockPaneStripSkin3.TextFont = new System.Drawing.Font("Tahoma", 8.25F); + tabGradient18.EndColor = System.Drawing.SystemColors.ActiveCaption; + tabGradient18.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient18.StartColor = System.Drawing.SystemColors.GradientActiveCaption; + tabGradient18.TextColor = System.Drawing.SystemColors.ActiveCaptionText; + dockPaneStripToolWindowGradient3.ActiveCaptionGradient = tabGradient18; + tabGradient19.EndColor = System.Drawing.SystemColors.Control; + tabGradient19.StartColor = System.Drawing.SystemColors.Control; + tabGradient19.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient3.ActiveTabGradient = tabGradient19; + dockPanelGradient9.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient9.StartColor = System.Drawing.SystemColors.ControlLight; + dockPaneStripToolWindowGradient3.DockStripGradient = dockPanelGradient9; + tabGradient20.EndColor = System.Drawing.SystemColors.InactiveCaption; + tabGradient20.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient20.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient20.TextColor = System.Drawing.SystemColors.InactiveCaptionText; + dockPaneStripToolWindowGradient3.InactiveCaptionGradient = tabGradient20; + tabGradient21.EndColor = System.Drawing.Color.Transparent; + tabGradient21.StartColor = System.Drawing.Color.Transparent; + tabGradient21.TextColor = System.Drawing.SystemColors.ControlDarkDark; + dockPaneStripToolWindowGradient3.InactiveTabGradient = tabGradient21; + dockPaneStripSkin3.ToolWindowGradient = dockPaneStripToolWindowGradient3; + dockPanelSkin3.DockPaneStripSkin = dockPaneStripSkin3; + this.dockPanel.Skin = dockPanelSkin3; this.dockPanel.TabIndex = 12; // // tableLayoutPanel1 @@ -926,6 +945,14 @@ this.gsOutBufferView.AllowUserToResizeRows = false; this.gsOutBufferView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells; this.gsOutBufferView.BackgroundColor = System.Drawing.Color.White; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle9.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.gsOutBufferView.DefaultCellStyle = dataGridViewCellStyle9; this.gsOutBufferView.Location = new System.Drawing.Point(476, 40); this.gsOutBufferView.Name = "gsOutBufferView"; this.gsOutBufferView.ReadOnly = true; diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs index 6824d1323..2c390283e 100644 --- a/renderdocui/Windows/BufferViewer.cs +++ b/renderdocui/Windows/BufferViewer.cs @@ -228,6 +228,16 @@ namespace renderdocui.Windows m_VSOut.m_GridView = vsOutBufferView; m_GSOut.m_GridView = gsOutBufferView; + rowOffset.Font = + byteOffset.Font = + instanceIdxToolitem.Font = + camSpeed.Font = + fovGuess.Font = + aspectGuess.Font = + nearGuess.Font = + farGuess.Font = + core.Config.PreferredFont; + m_ContextUIState = m_VSIn; DockHandler.GetPersistStringCallback = PersistString; @@ -1582,11 +1592,25 @@ namespace renderdocui.Windows { if (o is float) { - return Formatter.Format((float)o); + // pad with space on left if sign is missing, to better align + float f = (float)o; + if(f < 0.0f) + return Formatter.Format(f); + else if(f > 0.0f) + return " " + Formatter.Format(f); + else + return " " + Formatter.Format(0.0f); // force negative and positive 0 together } else if (o is double) { - return Formatter.Format((double)o); + // pad with space on left if sign is missing, to better align + double f = (double)o; + if (f < 0.0) + return Formatter.Format(f); + else if (f > 0.0) + return " " + Formatter.Format(f); + else + return " " + Formatter.Format(0.0); // force negative and positive 0 together } else if (o is uint) { diff --git a/renderdocui/Windows/DebugMessages.cs b/renderdocui/Windows/DebugMessages.cs index 26e605bbf..1c797940d 100644 --- a/renderdocui/Windows/DebugMessages.cs +++ b/renderdocui/Windows/DebugMessages.cs @@ -52,6 +52,8 @@ namespace renderdocui.Windows m_Core = core; + messages.Font = core.Config.PreferredFont; + RefreshMessageList(); } diff --git a/renderdocui/Windows/Dialogs/CaptureDialog.cs b/renderdocui/Windows/Dialogs/CaptureDialog.cs index 332dd8369..2f0224817 100644 --- a/renderdocui/Windows/Dialogs/CaptureDialog.cs +++ b/renderdocui/Windows/Dialogs/CaptureDialog.cs @@ -166,6 +166,12 @@ namespace renderdocui.Windows.Dialogs { InitializeComponent(); + exePath.Font = + workDirPath.Font = + cmdline.Font = + pidList.Font = + core.Config.PreferredFont; + Icon = global::renderdocui.Properties.Resources.icon; var defaults = new CaptureSettings(); diff --git a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.Designer.cs b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.Designer.cs index 6a5517afd..7c0ccf1f7 100644 --- a/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.Designer.cs +++ b/renderdocui/Windows/Dialogs/ConstantBufferPreviewer.Designer.cs @@ -69,8 +69,9 @@ // // slotLabel // + this.slotLabel.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.slotLabel.Name = "slotLabel"; - this.slotLabel.Size = new System.Drawing.Size(19, 22); + this.slotLabel.Size = new System.Drawing.Size(35, 22); this.slotLabel.Text = " "; // // toolStripSeparator1 @@ -80,8 +81,9 @@ // // nameLabel // + this.nameLabel.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nameLabel.Name = "nameLabel"; - this.nameLabel.Size = new System.Drawing.Size(22, 22); + this.nameLabel.Size = new System.Drawing.Size(42, 22); this.nameLabel.Text = " "; // // toolStripSeparator2 @@ -126,7 +128,7 @@ treeListColumn2.AutoSizeMinSize = 0; treeListColumn2.Width = 50; treeListColumn3.AutoSizeMinSize = 0; - treeListColumn3.Width = 50; + treeListColumn3.Width = 70; this.variables.Columns.AddRange(new TreelistView.TreeListColumn[] { treeListColumn1, treeListColumn2, @@ -134,6 +136,7 @@ this.variables.ColumnsOptions.LeftMargin = 0; this.variables.Cursor = System.Windows.Forms.Cursors.Arrow; this.variables.Dock = System.Windows.Forms.DockStyle.Fill; + this.variables.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.variables.Location = new System.Drawing.Point(0, 0); this.variables.Name = "variables"; this.variables.RowOptions.ShowHeader = false; diff --git a/renderdocui/Windows/Dialogs/RemoteHostSelect.cs b/renderdocui/Windows/Dialogs/RemoteHostSelect.cs index 03688117a..7af88c758 100644 --- a/renderdocui/Windows/Dialogs/RemoteHostSelect.cs +++ b/renderdocui/Windows/Dialogs/RemoteHostSelect.cs @@ -57,6 +57,10 @@ namespace renderdocui.Windows.Dialogs Icon = global::renderdocui.Properties.Resources.icon; + hostname.Font = + hosts.Font = + core.Config.PreferredFont; + m_Core = core; m_Main = main; diff --git a/renderdocui/Windows/Dialogs/ReplayHostManager.cs b/renderdocui/Windows/Dialogs/ReplayHostManager.cs index 11b707aa1..25bd45be2 100644 --- a/renderdocui/Windows/Dialogs/ReplayHostManager.cs +++ b/renderdocui/Windows/Dialogs/ReplayHostManager.cs @@ -52,6 +52,8 @@ namespace renderdocui.Windows.Dialogs { InitializeComponent(); + localProxy.Font = core.Config.PreferredFont; + Icon = global::renderdocui.Properties.Resources.icon; m_Core = core; @@ -111,6 +113,8 @@ namespace renderdocui.Windows.Dialogs host.FormattingEnabled = true; host.TabIndex = row + 1; + host.Font = m_Core.Config.PreferredFont; + hosts.Clear(); if (kv.Value.Length > 0) diff --git a/renderdocui/Windows/Dialogs/SettingsDialog.Designer.cs b/renderdocui/Windows/Dialogs/SettingsDialog.Designer.cs index 54abcfd11..3bc819881 100644 --- a/renderdocui/Windows/Dialogs/SettingsDialog.Designer.cs +++ b/renderdocui/Windows/Dialogs/SettingsDialog.Designer.cs @@ -43,16 +43,13 @@ System.Windows.Forms.Label label11; System.Windows.Forms.GroupBox groupBox2; System.Windows.Forms.Label label10; - System.Windows.Forms.Label label14; System.Windows.Forms.GroupBox groupBox3; System.Windows.Forms.Label label12; System.Windows.Forms.GroupBox groupBox4; System.Windows.Forms.Label label8; System.Windows.Forms.Label label9; - TreelistView.TreeListColumn treeListColumn1 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Section", "Section"))); - this.ok = new System.Windows.Forms.Button(); - this.toolTip = new System.Windows.Forms.ToolTip(this.components); - this.browserCaptureDialog = new System.Windows.Forms.FolderBrowserDialog(); + TreelistView.TreeListColumn treeListColumn2 = new TreelistView.TreeListColumn("Section", "Section"); + System.Windows.Forms.Label label15; this.settingsTabs = new renderdocui.Controls.TablessControl(); this.generalTab = new System.Windows.Forms.TabPage(); this.AllowGlobalHook = new System.Windows.Forms.CheckBox(); @@ -68,6 +65,7 @@ this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.TextureViewer_ResetRange = new System.Windows.Forms.CheckBox(); this.TextureViewer_PerTexSettings = new System.Windows.Forms.CheckBox(); + this.label14 = new System.Windows.Forms.Label(); this.shadViewTab = new System.Windows.Forms.TabPage(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); this.ShaderViewer_FriendlyNaming = new System.Windows.Forms.CheckBox(); @@ -76,6 +74,10 @@ this.EventBrowser_TimeUnit = new System.Windows.Forms.ComboBox(); this.EventBrowser_HideEmpty = new System.Windows.Forms.CheckBox(); this.pagesTree = new TreelistView.TreeListView(); + this.ok = new System.Windows.Forms.Button(); + this.toolTip = new System.Windows.Forms.ToolTip(this.components); + this.browserCaptureDialog = new System.Windows.Forms.FolderBrowserDialog(); + this.Font_PreferMonospaced = new System.Windows.Forms.CheckBox(); tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); groupBox1 = new System.Windows.Forms.GroupBox(); tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); @@ -90,12 +92,12 @@ label11 = new System.Windows.Forms.Label(); groupBox2 = new System.Windows.Forms.GroupBox(); label10 = new System.Windows.Forms.Label(); - label14 = new System.Windows.Forms.Label(); groupBox3 = new System.Windows.Forms.GroupBox(); label12 = new System.Windows.Forms.Label(); groupBox4 = new System.Windows.Forms.GroupBox(); label8 = new System.Windows.Forms.Label(); label9 = new System.Windows.Forms.Label(); + label15 = new System.Windows.Forms.Label(); tableLayoutPanel1.SuspendLayout(); this.settingsTabs.SuspendLayout(); this.generalTab.SuspendLayout(); @@ -134,21 +136,6 @@ tableLayoutPanel1.Size = new System.Drawing.Size(580, 353); tableLayoutPanel1.TabIndex = 1; // - // ok - // - this.ok.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.ok.Location = new System.Drawing.Point(502, 327); - this.ok.Name = "ok"; - this.ok.Size = new System.Drawing.Size(75, 23); - this.ok.TabIndex = 100; - this.ok.Text = "OK"; - this.ok.UseVisualStyleBackColor = true; - this.ok.Click += new System.EventHandler(this.ok_Click); - // - // browserCaptureDialog - // - this.browserCaptureDialog.RootFolder = System.Environment.SpecialFolder.MyComputer; - // // settingsTabs // this.settingsTabs.Alignment = System.Windows.Forms.TabAlignment.Left; @@ -209,10 +196,12 @@ tableLayoutPanel2.Controls.Add(this.CheckUpdate_AllowChecks, 1, 8); tableLayoutPanel2.Controls.Add(label11, 0, 6); tableLayoutPanel2.Controls.Add(this.browseCaptureDirectory, 1, 6); + tableLayoutPanel2.Controls.Add(label15, 0, 9); + tableLayoutPanel2.Controls.Add(this.Font_PreferMonospaced, 1, 9); tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; tableLayoutPanel2.Location = new System.Drawing.Point(3, 16); tableLayoutPanel2.Name = "tableLayoutPanel2"; - tableLayoutPanel2.RowCount = 10; + tableLayoutPanel2.RowCount = 11; tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); @@ -222,6 +211,7 @@ tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); tableLayoutPanel2.Size = new System.Drawing.Size(361, 285); tableLayoutPanel2.TabIndex = 0; @@ -541,7 +531,7 @@ this.tableLayoutPanel3.Controls.Add(this.TextureViewer_ResetRange, 1, 0); this.tableLayoutPanel3.Controls.Add(this.TextureViewer_PerTexSettings, 1, 1); this.tableLayoutPanel3.Controls.Add(label10, 0, 0); - this.tableLayoutPanel3.Controls.Add(label14, 0, 1); + this.tableLayoutPanel3.Controls.Add(this.label14, 0, 1); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 16); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; @@ -568,11 +558,12 @@ // this.TextureViewer_PerTexSettings.AutoSize = true; this.TextureViewer_PerTexSettings.Dock = System.Windows.Forms.DockStyle.Fill; - this.TextureViewer_PerTexSettings.Location = new System.Drawing.Point(291, 3); + this.TextureViewer_PerTexSettings.Location = new System.Drawing.Point(291, 23); this.TextureViewer_PerTexSettings.Name = "TextureViewer_PerTexSettings"; this.TextureViewer_PerTexSettings.Size = new System.Drawing.Size(67, 14); this.TextureViewer_PerTexSettings.TabIndex = 20; - this.toolTip.SetToolTip(this.TextureViewer_PerTexSettings, "The visible channels (RGBA) and selected mip/slice are remembered and restored per-texture."); + this.toolTip.SetToolTip(this.TextureViewer_PerTexSettings, "The visible channels (RGBA) and selected mip/slice are remembered and restored pe" + + "r-texture."); this.TextureViewer_PerTexSettings.UseVisualStyleBackColor = true; this.TextureViewer_PerTexSettings.CheckedChanged += new System.EventHandler(this.TextureViewer_PerTexSettings_CheckedChanged); // @@ -592,17 +583,17 @@ // // label14 // - label14.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - label14.AutoSize = true; - label14.Location = new System.Drawing.Point(3, 3); - label14.Margin = new System.Windows.Forms.Padding(3); - label14.Name = "label14"; - label14.Size = new System.Drawing.Size(282, 14); - label14.TabIndex = 4; - label14.Text = "Visible channels && mip/slice saved per-texture"; - label14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(3, 23); + this.label14.Margin = new System.Windows.Forms.Padding(3); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(282, 14); + this.label14.TabIndex = 4; + this.label14.Text = "Visible channels && mip/slice saved per-texture"; + this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // shadViewTab // @@ -763,11 +754,11 @@ // pagesTree // this.pagesTree.AlwaysDisplayVScroll = true; - treeListColumn1.AutoSize = true; - treeListColumn1.AutoSizeMinSize = 0; - treeListColumn1.Width = 50; + treeListColumn2.AutoSize = true; + treeListColumn2.AutoSizeMinSize = 0; + treeListColumn2.Width = 50; this.pagesTree.Columns.AddRange(new TreelistView.TreeListColumn[] { - treeListColumn1}); + treeListColumn2}); this.pagesTree.ColumnsOptions.HeaderHeight = 1; this.pagesTree.Cursor = System.Windows.Forms.Cursors.Arrow; this.pagesTree.Dock = System.Windows.Forms.DockStyle.Fill; @@ -782,6 +773,48 @@ this.pagesTree.ViewOptions.ShowPlusMinus = false; this.pagesTree.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.pagesTree_AfterSelect); // + // ok + // + this.ok.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ok.Location = new System.Drawing.Point(502, 327); + this.ok.Name = "ok"; + this.ok.Size = new System.Drawing.Size(75, 23); + this.ok.TabIndex = 100; + this.ok.Text = "OK"; + this.ok.UseVisualStyleBackColor = true; + this.ok.Click += new System.EventHandler(this.ok_Click); + // + // browserCaptureDialog + // + this.browserCaptureDialog.RootFolder = System.Environment.SpecialFolder.MyComputer; + // + // label15 + // + label15.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + label15.AutoSize = true; + label15.Location = new System.Drawing.Point(3, 231); + label15.Name = "label15"; + label15.Size = new System.Drawing.Size(259, 20); + label15.TabIndex = 17; + label15.Text = "Prefer monospaced fonts in UI (restart required)"; + label15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.toolTip.SetToolTip(label15, "Wherever possible a monospaced font will be used instead of the default font"); + // + // Font_PreferMonospaced + // + this.Font_PreferMonospaced.AutoSize = true; + this.Font_PreferMonospaced.Checked = true; + this.Font_PreferMonospaced.CheckState = System.Windows.Forms.CheckState.Checked; + this.Font_PreferMonospaced.Location = new System.Drawing.Point(268, 234); + this.Font_PreferMonospaced.Name = "Font_PreferMonospaced"; + this.Font_PreferMonospaced.Size = new System.Drawing.Size(15, 14); + this.Font_PreferMonospaced.TabIndex = 18; + this.toolTip.SetToolTip(this.Font_PreferMonospaced, "Wherever possible a monospaced font will be used instead of the default font"); + this.Font_PreferMonospaced.UseVisualStyleBackColor = true; + this.Font_PreferMonospaced.CheckedChanged += new System.EventHandler(this.Font_PreferMonospaced_CheckedChanged); + // // SettingsDialog // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -847,5 +880,7 @@ private System.Windows.Forms.Button browseCaptureDirectory; private System.Windows.Forms.FolderBrowserDialog browserCaptureDialog; private System.Windows.Forms.CheckBox AllowGlobalHook; + private System.Windows.Forms.CheckBox Font_PreferMonospaced; + private System.Windows.Forms.Label label14; } } \ No newline at end of file diff --git a/renderdocui/Windows/Dialogs/SettingsDialog.cs b/renderdocui/Windows/Dialogs/SettingsDialog.cs index 5c161e730..dfc5185b8 100644 --- a/renderdocui/Windows/Dialogs/SettingsDialog.cs +++ b/renderdocui/Windows/Dialogs/SettingsDialog.cs @@ -61,6 +61,7 @@ namespace renderdocui.Windows.Dialogs TextureViewer_PerTexSettings.Checked = m_Core.Config.TextureViewer_PerTexSettings; ShaderViewer_FriendlyNaming.Checked = m_Core.Config.ShaderViewer_FriendlyNaming; CheckUpdate_AllowChecks.Checked = m_Core.Config.CheckUpdate_AllowChecks; + Font_PreferMonospaced.Checked = m_Core.Config.Font_PreferMonospaced; AllowGlobalHook.Checked = m_Core.Config.AllowGlobalHook; @@ -140,7 +141,7 @@ namespace renderdocui.Windows.Dialogs m_Core.Config.Formatter_NegExp = (int)Formatter_NegExp.Value; m_Core.Config.Formatter_PosExp = (int)Formatter_PosExp.Value; - m_Core.Config.SetupFormatter(); + m_Core.Config.SetupFormatting(); m_Core.Config.Serialize(Core.ConfigFilename); } @@ -152,6 +153,15 @@ namespace renderdocui.Windows.Dialogs m_Core.Config.Serialize(Core.ConfigFilename); } + private void Font_PreferMonospaced_CheckedChanged(object sender, EventArgs e) + { + m_Core.Config.Font_PreferMonospaced = Font_PreferMonospaced.Checked; + + m_Core.Config.SetupFormatting(); + + m_Core.Config.Serialize(Core.ConfigFilename); + } + private void AllowGlobalHook_CheckedChanged(object sender, EventArgs e) { m_Core.Config.AllowGlobalHook = AllowGlobalHook.Checked; diff --git a/renderdocui/Windows/Dialogs/SettingsDialog.resx b/renderdocui/Windows/Dialogs/SettingsDialog.resx index 9338a19db..f6ef9c4ee 100644 --- a/renderdocui/Windows/Dialogs/SettingsDialog.resx +++ b/renderdocui/Windows/Dialogs/SettingsDialog.resx @@ -156,18 +156,39 @@ False + + False + + + 17, 17 + + + False + + + False + + + False + False False + + False + False False + + False + False @@ -177,6 +198,12 @@ False + + False + + + False + 102, 17 diff --git a/renderdocui/Windows/Dialogs/TextureSaveDialog.cs b/renderdocui/Windows/Dialogs/TextureSaveDialog.cs index 33a2f6ff1..cb711b233 100644 --- a/renderdocui/Windows/Dialogs/TextureSaveDialog.cs +++ b/renderdocui/Windows/Dialogs/TextureSaveDialog.cs @@ -8,15 +8,26 @@ using System.IO; using System.Text; using System.Windows.Forms; using renderdoc; +using renderdocui.Code; namespace renderdocui.Windows.Dialogs { public partial class TextureSaveDialog : Form { - public TextureSaveDialog() + public TextureSaveDialog(Core core) { InitializeComponent(); + filename.Font = + fileFormat.Font = + jpegCompression.Font = + mipSelect.Font = + sampleSelect.Font = + sliceSelect.Font = + blackPoint.Font = + whitePoint.Font = + core.Config.PreferredFont; + fileFormat.Items.Clear(); string filter = ""; diff --git a/renderdocui/Windows/EventBrowser.cs b/renderdocui/Windows/EventBrowser.cs index 16c263d1f..46c3e44d6 100644 --- a/renderdocui/Windows/EventBrowser.cs +++ b/renderdocui/Windows/EventBrowser.cs @@ -63,6 +63,11 @@ namespace renderdocui.Windows Icon = global::renderdocui.Properties.Resources.icon; + jumpToEID.Font = + findEvent.Font = + eventView.Font = + core.Config.PreferredFont; + HideJumpAndFind(); m_Core = core; diff --git a/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.Designer.cs b/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.Designer.cs index fc1c8aab6..5d3a1f1cb 100644 --- a/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.Designer.cs +++ b/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.Designer.cs @@ -35,7 +35,7 @@ TreelistView.TreeListColumn treeListColumn2 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Buffer", "Buffer"))); TreelistView.TreeListColumn treeListColumn3 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Stride", "Stride"))); TreelistView.TreeListColumn treeListColumn4 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Offset", "Offset"))); - TreelistView.TreeListColumn treeListColumn5 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("bytelen", "Buffer Byte Len"))); + TreelistView.TreeListColumn treeListColumn5 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("bytelen", "Byte Len"))); TreelistView.TreeListColumn treeListColumn6 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); System.Windows.Forms.GroupBox groupBox2; TreelistView.TreeListColumn treeListColumn7 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); @@ -196,12 +196,12 @@ TreelistView.TreeListColumn treeListColumn152 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); TreelistView.TreeListColumn treeListColumn153 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Enabled", "Enabled"))); TreelistView.TreeListColumn treeListColumn154 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Logic", "Logic"))); - TreelistView.TreeListColumn treeListColumn155 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Blend Src", "Blend Src"))); - TreelistView.TreeListColumn treeListColumn156 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Blend Dst", "Blend Dst"))); - TreelistView.TreeListColumn treeListColumn157 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Blend Op", "Blend Op"))); - TreelistView.TreeListColumn treeListColumn158 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Alpha Blend Src", "Alpha Blend Src"))); - TreelistView.TreeListColumn treeListColumn159 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Alpha Blend Dst", "Alpha Blend Dst"))); - TreelistView.TreeListColumn treeListColumn160 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Alpha Blend Op", "Alpha Blend Op"))); + TreelistView.TreeListColumn treeListColumn155 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Colour Src", "Colour Src"))); + TreelistView.TreeListColumn treeListColumn156 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Colour Dst", "Colour Dst"))); + TreelistView.TreeListColumn treeListColumn157 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Colour Op", "Colour Op"))); + TreelistView.TreeListColumn treeListColumn158 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Alpha Src", "Alpha Src"))); + TreelistView.TreeListColumn treeListColumn159 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Alpha Dst", "Alpha Dst"))); + TreelistView.TreeListColumn treeListColumn160 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Alpha Op", "Alpha Op"))); TreelistView.TreeListColumn treeListColumn161 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Logic Op", "Logic Op"))); TreelistView.TreeListColumn treeListColumn162 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Write Mask", "Write Mask"))); TreelistView.TreeListColumn treeListColumn163 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Face", "Face"))); @@ -240,18 +240,13 @@ TreelistView.TreeListColumn treeListColumn196 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Vec4 Range", "Vec4 Range"))); TreelistView.TreeListColumn treeListColumn197 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Size", "Size"))); TreelistView.TreeListColumn treeListColumn198 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + this.pipeFlow = new renderdocui.Controls.PipelineFlowchart(); this.flowLayoutPanel6 = new System.Windows.Forms.FlowLayoutPanel(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.showDisabledToolitem = new System.Windows.Forms.ToolStripButton(); this.showEmptyToolitem = new System.Windows.Forms.ToolStripButton(); this.export = new System.Windows.Forms.ToolStripButton(); - this.rightclickMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.showDisabled = new System.Windows.Forms.ToolStripMenuItem(); - this.showEmpty = new System.Windows.Forms.ToolStripMenuItem(); - this.toolTip = new System.Windows.Forms.ToolTip(this.components); - this.exportDialog = new System.Windows.Forms.SaveFileDialog(); - this.pipeFlow = new renderdocui.Controls.PipelineFlowchart(); this.stageTabControl = new renderdocui.Controls.TablessControl(); this.tabIA = new System.Windows.Forms.TabPage(); this.panel1 = new System.Windows.Forms.Panel(); @@ -440,6 +435,11 @@ this.csSamplers = new TreelistView.TreeListView(); this.groupBox36 = new System.Windows.Forms.GroupBox(); this.csCBuffers = new TreelistView.TreeListView(); + this.rightclickMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.showDisabled = new System.Windows.Forms.ToolStripMenuItem(); + this.showEmpty = new System.Windows.Forms.ToolStripMenuItem(); + this.toolTip = new System.Windows.Forms.ToolTip(this.components); + this.exportDialog = new System.Windows.Forms.SaveFileDialog(); toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); toolstripTable = new System.Windows.Forms.TableLayoutPanel(); groupBox2 = new System.Windows.Forms.GroupBox(); @@ -455,7 +455,6 @@ toolstripTable.SuspendLayout(); this.flowLayoutPanel6.SuspendLayout(); this.toolStrip1.SuspendLayout(); - this.rightclickMenu.SuspendLayout(); this.stageTabControl.SuspendLayout(); this.tabIA.SuspendLayout(); this.panel1.SuspendLayout(); @@ -602,6 +601,7 @@ ((System.ComponentModel.ISupportInitialize)(this.csSamplers)).BeginInit(); this.groupBox36.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.csCBuffers)).BeginInit(); + this.rightclickMenu.SuspendLayout(); this.SuspendLayout(); // // toolStripLabel1 @@ -627,6 +627,19 @@ toolstripTable.Size = new System.Drawing.Size(1171, 738); toolstripTable.TabIndex = 2; // + // pipeFlow + // + this.pipeFlow.BackColor = System.Drawing.Color.Transparent; + this.pipeFlow.Dock = System.Windows.Forms.DockStyle.Fill; + this.pipeFlow.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.pipeFlow.Location = new System.Drawing.Point(4, 35); + this.pipeFlow.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pipeFlow.Name = "pipeFlow"; + this.pipeFlow.SelectedStage = 0; + this.pipeFlow.Size = new System.Drawing.Size(1163, 62); + this.pipeFlow.TabIndex = 0; + this.pipeFlow.SelectedStageChanged += new System.EventHandler(this.pipeFlow_SelectedStageChanged); + // // flowLayoutPanel6 // this.flowLayoutPanel6.AutoSize = true; @@ -685,49 +698,6 @@ this.export.Text = "Export"; this.export.Click += new System.EventHandler(this.export_Click); // - // rightclickMenu - // - this.rightclickMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.showDisabled, - this.showEmpty}); - this.rightclickMenu.Name = "rightclickMenu"; - this.rightclickMenu.Size = new System.Drawing.Size(144, 48); - // - // showDisabled - // - this.showDisabled.Image = global::renderdocui.Properties.Resources.page_white_delete; - this.showDisabled.Name = "showDisabled"; - this.showDisabled.Size = new System.Drawing.Size(143, 22); - this.showDisabled.Text = "Show Disabled"; - this.showDisabled.Click += new System.EventHandler(this.hideDisabled_Click); - // - // showEmpty - // - this.showEmpty.Image = global::renderdocui.Properties.Resources.page_white_database; - this.showEmpty.Name = "showEmpty"; - this.showEmpty.Size = new System.Drawing.Size(143, 22); - this.showEmpty.Text = "Show Empty"; - this.showEmpty.Click += new System.EventHandler(this.hideEmpty_Click); - // - // exportDialog - // - this.exportDialog.DefaultExt = "html"; - this.exportDialog.Filter = "HTML Files (*.html)|*.html"; - this.exportDialog.Title = "Export pipeline state as HTML"; - // - // pipeFlow - // - this.pipeFlow.BackColor = System.Drawing.Color.Transparent; - this.pipeFlow.Dock = System.Windows.Forms.DockStyle.Fill; - this.pipeFlow.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.pipeFlow.Location = new System.Drawing.Point(4, 35); - this.pipeFlow.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.pipeFlow.Name = "pipeFlow"; - this.pipeFlow.SelectedStage = 0; - this.pipeFlow.Size = new System.Drawing.Size(1163, 62); - this.pipeFlow.TabIndex = 0; - this.pipeFlow.SelectedStageChanged += new System.EventHandler(this.pipeFlow_SelectedStageChanged); - // // stageTabControl // this.stageTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -925,13 +895,13 @@ treeListColumn10.AutoSizeMinSize = 0; treeListColumn10.Width = 150; treeListColumn11.AutoSizeMinSize = 0; - treeListColumn11.Width = 60; + treeListColumn11.Width = 80; treeListColumn12.AutoSizeMinSize = 0; treeListColumn12.Width = 150; treeListColumn13.AutoSizeMinSize = 0; treeListColumn13.Width = 90; treeListColumn14.AutoSizeMinSize = 0; - treeListColumn14.Width = 60; + treeListColumn14.Width = 75; treeListColumn15.AutoSizeMinSize = 0; treeListColumn15.Width = 25; this.inputLayouts.Columns.AddRange(new TreelistView.TreeListColumn[] { @@ -1235,7 +1205,7 @@ treeListColumn20.AutoSizeMinSize = 150; treeListColumn20.Width = 50; treeListColumn21.AutoSizeMinSize = 0; - treeListColumn21.Width = 75; + treeListColumn21.Width = 85; treeListColumn22.AutoSizeMinSize = 0; treeListColumn22.Width = 50; treeListColumn23.AutoSizeMinSize = 0; @@ -1243,7 +1213,7 @@ treeListColumn24.AutoSizeMinSize = 0; treeListColumn24.Width = 50; treeListColumn25.AutoSizeMinSize = 0; - treeListColumn25.Width = 75; + treeListColumn25.Width = 85; treeListColumn26.AutoSizeMinSize = 0; treeListColumn26.Width = 200; treeListColumn27.AutoSizeMinSize = 0; @@ -1301,7 +1271,7 @@ treeListColumn30.AutoSizeMinSize = 0; treeListColumn30.Width = 250; treeListColumn31.AutoSizeMinSize = 0; - treeListColumn31.Width = 70; + treeListColumn31.Width = 90; treeListColumn32.AutoSize = true; treeListColumn32.AutoSizeMinSize = 50; treeListColumn32.Width = 50; @@ -1351,7 +1321,7 @@ treeListColumn34.AutoSizeMinSize = 100; treeListColumn34.Width = 50; treeListColumn35.AutoSizeMinSize = 0; - treeListColumn35.Width = 75; + treeListColumn35.Width = 85; treeListColumn36.AutoSizeMinSize = 0; treeListColumn36.Width = 200; treeListColumn37.AutoSizeMinSize = 0; @@ -1556,7 +1526,7 @@ treeListColumn42.AutoSizeMinSize = 150; treeListColumn42.Width = 50; treeListColumn43.AutoSizeMinSize = 0; - treeListColumn43.Width = 75; + treeListColumn43.Width = 85; treeListColumn44.AutoSizeMinSize = 0; treeListColumn44.Width = 50; treeListColumn45.AutoSizeMinSize = 0; @@ -1564,7 +1534,7 @@ treeListColumn46.AutoSizeMinSize = 0; treeListColumn46.Width = 50; treeListColumn47.AutoSizeMinSize = 0; - treeListColumn47.Width = 75; + treeListColumn47.Width = 85; treeListColumn48.AutoSizeMinSize = 0; treeListColumn48.Width = 200; treeListColumn49.AutoSizeMinSize = 0; @@ -1622,7 +1592,7 @@ treeListColumn52.AutoSizeMinSize = 0; treeListColumn52.Width = 250; treeListColumn53.AutoSizeMinSize = 0; - treeListColumn53.Width = 70; + treeListColumn53.Width = 90; treeListColumn54.AutoSize = true; treeListColumn54.AutoSizeMinSize = 50; treeListColumn54.Width = 50; @@ -1672,7 +1642,7 @@ treeListColumn56.AutoSizeMinSize = 100; treeListColumn56.Width = 50; treeListColumn57.AutoSizeMinSize = 0; - treeListColumn57.Width = 75; + treeListColumn57.Width = 85; treeListColumn58.AutoSizeMinSize = 0; treeListColumn58.Width = 200; treeListColumn59.AutoSizeMinSize = 0; @@ -1877,7 +1847,7 @@ treeListColumn64.AutoSizeMinSize = 150; treeListColumn64.Width = 50; treeListColumn65.AutoSizeMinSize = 0; - treeListColumn65.Width = 75; + treeListColumn65.Width = 85; treeListColumn66.AutoSizeMinSize = 0; treeListColumn66.Width = 50; treeListColumn67.AutoSizeMinSize = 0; @@ -1885,7 +1855,7 @@ treeListColumn68.AutoSizeMinSize = 0; treeListColumn68.Width = 50; treeListColumn69.AutoSizeMinSize = 0; - treeListColumn69.Width = 75; + treeListColumn69.Width = 85; treeListColumn70.AutoSizeMinSize = 0; treeListColumn70.Width = 200; treeListColumn71.AutoSizeMinSize = 0; @@ -1943,7 +1913,7 @@ treeListColumn74.AutoSizeMinSize = 0; treeListColumn74.Width = 250; treeListColumn75.AutoSizeMinSize = 0; - treeListColumn75.Width = 70; + treeListColumn75.Width = 90; treeListColumn76.AutoSize = true; treeListColumn76.AutoSizeMinSize = 50; treeListColumn76.Width = 50; @@ -1993,7 +1963,7 @@ treeListColumn78.AutoSizeMinSize = 100; treeListColumn78.Width = 50; treeListColumn79.AutoSizeMinSize = 0; - treeListColumn79.Width = 75; + treeListColumn79.Width = 85; treeListColumn80.AutoSizeMinSize = 0; treeListColumn80.Width = 200; treeListColumn81.AutoSizeMinSize = 0; @@ -2247,7 +2217,7 @@ treeListColumn91.AutoSizeMinSize = 150; treeListColumn91.Width = 50; treeListColumn92.AutoSizeMinSize = 0; - treeListColumn92.Width = 75; + treeListColumn92.Width = 85; treeListColumn93.AutoSizeMinSize = 0; treeListColumn93.Width = 50; treeListColumn94.AutoSizeMinSize = 0; @@ -2255,7 +2225,7 @@ treeListColumn95.AutoSizeMinSize = 0; treeListColumn95.Width = 50; treeListColumn96.AutoSizeMinSize = 0; - treeListColumn96.Width = 75; + treeListColumn96.Width = 85; treeListColumn97.AutoSizeMinSize = 0; treeListColumn97.Width = 200; treeListColumn98.AutoSizeMinSize = 0; @@ -2313,7 +2283,7 @@ treeListColumn101.AutoSizeMinSize = 0; treeListColumn101.Width = 250; treeListColumn102.AutoSizeMinSize = 0; - treeListColumn102.Width = 70; + treeListColumn102.Width = 90; treeListColumn103.AutoSize = true; treeListColumn103.AutoSizeMinSize = 50; treeListColumn103.Width = 50; @@ -2461,7 +2431,7 @@ this.tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 607F)); + this.tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 608F)); this.tableLayoutPanel8.Controls.Add(this.forcedSampleCount, 7, 1); this.tableLayoutPanel8.Controls.Add(this.label14, 6, 1); this.tableLayoutPanel8.Controls.Add(this.frontCCW, 5, 0); @@ -2758,7 +2728,7 @@ treeListColumn113.AutoSizeMinSize = 0; treeListColumn113.Width = 50; treeListColumn114.AutoSizeMinSize = 0; - treeListColumn114.Width = 60; + treeListColumn114.Width = 70; treeListColumn115.AutoSize = true; treeListColumn115.AutoSizeMinSize = 60; treeListColumn115.Width = 60; @@ -3006,7 +2976,7 @@ treeListColumn125.AutoSizeMinSize = 150; treeListColumn125.Width = 50; treeListColumn126.AutoSizeMinSize = 0; - treeListColumn126.Width = 75; + treeListColumn126.Width = 85; treeListColumn127.AutoSizeMinSize = 0; treeListColumn127.Width = 50; treeListColumn128.AutoSizeMinSize = 0; @@ -3014,7 +2984,7 @@ treeListColumn129.AutoSizeMinSize = 0; treeListColumn129.Width = 50; treeListColumn130.AutoSizeMinSize = 0; - treeListColumn130.Width = 75; + treeListColumn130.Width = 85; treeListColumn131.AutoSizeMinSize = 0; treeListColumn131.Width = 200; treeListColumn132.AutoSizeMinSize = 0; @@ -3072,7 +3042,7 @@ treeListColumn135.AutoSizeMinSize = 0; treeListColumn135.Width = 250; treeListColumn136.AutoSizeMinSize = 0; - treeListColumn136.Width = 70; + treeListColumn136.Width = 90; treeListColumn137.AutoSize = true; treeListColumn137.AutoSizeMinSize = 50; treeListColumn137.Width = 50; @@ -3122,7 +3092,7 @@ treeListColumn139.AutoSizeMinSize = 100; treeListColumn139.Width = 50; treeListColumn140.AutoSizeMinSize = 0; - treeListColumn140.Width = 75; + treeListColumn140.Width = 85; treeListColumn141.AutoSizeMinSize = 0; treeListColumn141.Width = 200; treeListColumn142.AutoSizeMinSize = 0; @@ -3221,7 +3191,7 @@ treeListColumn148.AutoSizeMinSize = 0; treeListColumn148.Width = 50; treeListColumn149.AutoSizeMinSize = 0; - treeListColumn149.Width = 75; + treeListColumn149.Width = 85; treeListColumn150.AutoSizeMinSize = 0; treeListColumn150.Width = 200; treeListColumn151.AutoSizeMinSize = 0; @@ -3274,7 +3244,7 @@ treeListColumn152.AutoSizeMinSize = 0; treeListColumn152.Width = 50; treeListColumn153.AutoSizeMinSize = 0; - treeListColumn153.Width = 50; + treeListColumn153.Width = 60; treeListColumn154.AutoSizeMinSize = 0; treeListColumn154.Width = 50; treeListColumn155.AutoSizeMinSize = 0; @@ -3822,7 +3792,7 @@ treeListColumn173.AutoSizeMinSize = 0; treeListColumn173.Width = 50; treeListColumn174.AutoSizeMinSize = 0; - treeListColumn174.Width = 75; + treeListColumn174.Width = 85; treeListColumn175.AutoSizeMinSize = 0; treeListColumn175.Width = 200; treeListColumn176.AutoSizeMinSize = 0; @@ -4091,7 +4061,7 @@ treeListColumn181.AutoSizeMinSize = 150; treeListColumn181.Width = 50; treeListColumn182.AutoSizeMinSize = 0; - treeListColumn182.Width = 75; + treeListColumn182.Width = 85; treeListColumn183.AutoSizeMinSize = 0; treeListColumn183.Width = 50; treeListColumn184.AutoSizeMinSize = 0; @@ -4099,7 +4069,7 @@ treeListColumn185.AutoSizeMinSize = 0; treeListColumn185.Width = 50; treeListColumn186.AutoSizeMinSize = 0; - treeListColumn186.Width = 75; + treeListColumn186.Width = 85; treeListColumn187.AutoSizeMinSize = 0; treeListColumn187.Width = 200; treeListColumn188.AutoSizeMinSize = 0; @@ -4156,7 +4126,7 @@ treeListColumn191.AutoSizeMinSize = 0; treeListColumn191.Width = 250; treeListColumn192.AutoSizeMinSize = 0; - treeListColumn192.Width = 70; + treeListColumn192.Width = 90; treeListColumn193.AutoSize = true; treeListColumn193.AutoSizeMinSize = 50; treeListColumn193.Width = 50; @@ -4205,7 +4175,7 @@ treeListColumn195.AutoSizeMinSize = 100; treeListColumn195.Width = 50; treeListColumn196.AutoSizeMinSize = 0; - treeListColumn196.Width = 75; + treeListColumn196.Width = 85; treeListColumn197.AutoSizeMinSize = 0; treeListColumn197.Width = 200; treeListColumn198.AutoSizeMinSize = 0; @@ -4238,6 +4208,36 @@ this.csCBuffers.Leave += new System.EventHandler(this.disableSelection_Leave); this.csCBuffers.MouseClick += new System.Windows.Forms.MouseEventHandler(this.hideDisabledEmpty_MouseClick); // + // rightclickMenu + // + this.rightclickMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.showDisabled, + this.showEmpty}); + this.rightclickMenu.Name = "rightclickMenu"; + this.rightclickMenu.Size = new System.Drawing.Size(144, 48); + // + // showDisabled + // + this.showDisabled.Image = global::renderdocui.Properties.Resources.page_white_delete; + this.showDisabled.Name = "showDisabled"; + this.showDisabled.Size = new System.Drawing.Size(143, 22); + this.showDisabled.Text = "Show Disabled"; + this.showDisabled.Click += new System.EventHandler(this.hideDisabled_Click); + // + // showEmpty + // + this.showEmpty.Image = global::renderdocui.Properties.Resources.page_white_database; + this.showEmpty.Name = "showEmpty"; + this.showEmpty.Size = new System.Drawing.Size(143, 22); + this.showEmpty.Text = "Show Empty"; + this.showEmpty.Click += new System.EventHandler(this.hideEmpty_Click); + // + // exportDialog + // + this.exportDialog.DefaultExt = "html"; + this.exportDialog.Filter = "HTML Files (*.html)|*.html"; + this.exportDialog.Title = "Export pipeline state as HTML"; + // // D3D11PipelineStateViewer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -4252,7 +4252,6 @@ this.flowLayoutPanel6.PerformLayout(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); - this.rightclickMenu.ResumeLayout(false); this.stageTabControl.ResumeLayout(false); this.tabIA.ResumeLayout(false); this.panel1.ResumeLayout(false); @@ -4416,6 +4415,7 @@ ((System.ComponentModel.ISupportInitialize)(this.csSamplers)).EndInit(); this.groupBox36.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.csCBuffers)).EndInit(); + this.rightclickMenu.ResumeLayout(false); this.ResumeLayout(false); } diff --git a/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs b/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs index 3ff508559..86dfb435e 100644 --- a/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs +++ b/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs @@ -53,6 +53,31 @@ namespace renderdocui.Windows.PipelineState m_DockContent = c; + inputLayouts.Font = core.Config.PreferredFont; + iabuffers.Font = core.Config.PreferredFont; + + csUAVs.Font = core.Config.PreferredFont; + gsStreams.Font = core.Config.PreferredFont; + + groupX.Font = groupY.Font = groupZ.Font = core.Config.PreferredFont; + threadX.Font = threadY.Font = threadZ.Font = core.Config.PreferredFont; + + vsShader.Font = vsResources.Font = vsSamplers.Font = vsCBuffers.Font = vsClasses.Font = core.Config.PreferredFont; + gsShader.Font = gsResources.Font = gsSamplers.Font = gsCBuffers.Font = gsClasses.Font = core.Config.PreferredFont; + hsShader.Font = hsResources.Font = hsSamplers.Font = hsCBuffers.Font = hsClasses.Font = core.Config.PreferredFont; + dsShader.Font = dsResources.Font = dsSamplers.Font = dsCBuffers.Font = dsClasses.Font = core.Config.PreferredFont; + psShader.Font = psResources.Font = psSamplers.Font = psCBuffers.Font = psClasses.Font = core.Config.PreferredFont; + csShader.Font = csResources.Font = csSamplers.Font = csCBuffers.Font = csClasses.Font = core.Config.PreferredFont; + + viewports.Font = core.Config.PreferredFont; + scissors.Font = core.Config.PreferredFont; + + targetOutputs.Font = core.Config.PreferredFont; + blendOperations.Font = core.Config.PreferredFont; + + pipeFlow.Font = new System.Drawing.Font(core.Config.PreferredFont.FontFamily, 11.25F, + System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + pipeFlow.SetStages(new KeyValuePair[] { new KeyValuePair("IA", "Input Assembler"), new KeyValuePair("VS", "Vertex Shader"), @@ -261,7 +286,7 @@ namespace renderdocui.Windows.PipelineState a = texs[t].arraysize; format = texs[t].format.ToString(); name = texs[t].name; - typename = texs[t].resType.ToString(); + typename = texs[t].resType.Str(); tag = texs[t]; } @@ -887,7 +912,7 @@ namespace renderdocui.Windows.PipelineState a = texs[t].arraysize; format = texs[t].format.ToString(); name = texs[t].name; - typename = texs[t].resType.ToString(); + typename = texs[t].resType.Str(); tag = texs[t]; } @@ -1125,7 +1150,7 @@ namespace renderdocui.Windows.PipelineState a = texs[t].arraysize; format = texs[t].format.ToString(); name = texs[t].name; - typename = texs[t].resType.ToString(); + typename = texs[t].resType.Str(); tag = texs[t]; } @@ -1202,7 +1227,7 @@ namespace renderdocui.Windows.PipelineState a = texs[t].arraysize; format = texs[t].format.ToString(); name = texs[t].name; - typename = texs[t].resType.ToString(); + typename = texs[t].resType.Str(); tag = texs[t]; } @@ -1288,7 +1313,7 @@ namespace renderdocui.Windows.PipelineState a = texs[t].arraysize; format = texs[t].format.ToString(); name = texs[t].name; - typename = texs[t].resType.ToString(); + typename = texs[t].resType.Str(); tag = texs[t]; } diff --git a/renderdocui/Windows/PipelineState/GLPipelineStateViewer.Designer.cs b/renderdocui/Windows/PipelineState/GLPipelineStateViewer.Designer.cs index 356b7d667..464cf7abb 100644 --- a/renderdocui/Windows/PipelineState/GLPipelineStateViewer.Designer.cs +++ b/renderdocui/Windows/PipelineState/GLPipelineStateViewer.Designer.cs @@ -31,144 +31,144 @@ this.components = new System.ComponentModel.Container(); System.Windows.Forms.ToolStripLabel toolStripLabel1; System.Windows.Forms.TableLayoutPanel toolstripTable; - TreelistView.TreeListColumn treeListColumn1 = new TreelistView.TreeListColumn("Index", "Index"); - TreelistView.TreeListColumn treeListColumn2 = new TreelistView.TreeListColumn("Buffer", "Buffer"); - TreelistView.TreeListColumn treeListColumn3 = new TreelistView.TreeListColumn("Stride", "Stride"); - TreelistView.TreeListColumn treeListColumn4 = new TreelistView.TreeListColumn("Offset", "Offset"); - TreelistView.TreeListColumn treeListColumn5 = new TreelistView.TreeListColumn("Divisor", "Divisor"); - TreelistView.TreeListColumn treeListColumn6 = new TreelistView.TreeListColumn("bytelen", "Buffer Byte Len"); - TreelistView.TreeListColumn treeListColumn7 = new TreelistView.TreeListColumn("Go", "Go"); + TreelistView.TreeListColumn treeListColumn1 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Index", "Index"))); + TreelistView.TreeListColumn treeListColumn2 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Buffer", "Buffer"))); + TreelistView.TreeListColumn treeListColumn3 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Stride", "Stride"))); + TreelistView.TreeListColumn treeListColumn4 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Offset", "Offset"))); + TreelistView.TreeListColumn treeListColumn5 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Divisor", "Divisor"))); + TreelistView.TreeListColumn treeListColumn6 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("bytelen", "Byte Len"))); + TreelistView.TreeListColumn treeListColumn7 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); System.Windows.Forms.GroupBox groupBox2; - TreelistView.TreeListColumn treeListColumn8 = new TreelistView.TreeListColumn("Index", "Index"); - TreelistView.TreeListColumn treeListColumn9 = new TreelistView.TreeListColumn("Enabled", "Enabled"); - TreelistView.TreeListColumn treeListColumn10 = new TreelistView.TreeListColumn("Name", "Name"); - TreelistView.TreeListColumn treeListColumn11 = new TreelistView.TreeListColumn("Format", "Format/Generic Value"); - TreelistView.TreeListColumn treeListColumn12 = new TreelistView.TreeListColumn("Buffer Slot", "Buffer Slot"); - TreelistView.TreeListColumn treeListColumn13 = new TreelistView.TreeListColumn("Relative Offset", "Relative Offset"); - TreelistView.TreeListColumn treeListColumn14 = new TreelistView.TreeListColumn("Go", "Go"); + TreelistView.TreeListColumn treeListColumn8 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Index", "Index"))); + TreelistView.TreeListColumn treeListColumn9 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Enabled", "Enabled"))); + TreelistView.TreeListColumn treeListColumn10 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Name", "Name"))); + TreelistView.TreeListColumn treeListColumn11 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format/Generic Value"))); + TreelistView.TreeListColumn treeListColumn12 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Buffer Slot", "Buffer Slot"))); + TreelistView.TreeListColumn treeListColumn13 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Relative Offset", "Relative Offset"))); + TreelistView.TreeListColumn treeListColumn14 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); System.Windows.Forms.GroupBox groupBox44; - TreelistView.TreeListColumn treeListColumn15 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn16 = new TreelistView.TreeListColumn("Resource", "Resource"); - TreelistView.TreeListColumn treeListColumn17 = new TreelistView.TreeListColumn("Type", "Type"); - TreelistView.TreeListColumn treeListColumn18 = new TreelistView.TreeListColumn("Width", "Width"); - TreelistView.TreeListColumn treeListColumn19 = new TreelistView.TreeListColumn("Height", "Height"); - TreelistView.TreeListColumn treeListColumn20 = new TreelistView.TreeListColumn("Depth", "Depth"); - TreelistView.TreeListColumn treeListColumn21 = new TreelistView.TreeListColumn("Array Size", "Array Size"); - TreelistView.TreeListColumn treeListColumn22 = new TreelistView.TreeListColumn("Format", "Format"); - TreelistView.TreeListColumn treeListColumn23 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn24 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn25 = new TreelistView.TreeListColumn("Addressing", "Addressing"); - TreelistView.TreeListColumn treeListColumn26 = new TreelistView.TreeListColumn("Min Filter", "Min Filter"); - TreelistView.TreeListColumn treeListColumn27 = new TreelistView.TreeListColumn("Mag Filter", "Mag Filter"); - TreelistView.TreeListColumn treeListColumn28 = new TreelistView.TreeListColumn("LOD Clamp", "LOD Clamp"); - TreelistView.TreeListColumn treeListColumn29 = new TreelistView.TreeListColumn("LOD Bias", "LOD Bias"); - TreelistView.TreeListColumn treeListColumn30 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn31 = new TreelistView.TreeListColumn("Buffer", "Buffer"); - TreelistView.TreeListColumn treeListColumn32 = new TreelistView.TreeListColumn("Byte Range", "Byte Range"); - TreelistView.TreeListColumn treeListColumn33 = new TreelistView.TreeListColumn("Size", "Size"); - TreelistView.TreeListColumn treeListColumn34 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn35 = new TreelistView.TreeListColumn("Uniform", "Uniform"); - TreelistView.TreeListColumn treeListColumn36 = new TreelistView.TreeListColumn("Value", "Value"); - TreelistView.TreeListColumn treeListColumn37 = new TreelistView.TreeListColumn("BindingType", "Binding"); - TreelistView.TreeListColumn treeListColumn38 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn39 = new TreelistView.TreeListColumn("Resource", "Resource"); - TreelistView.TreeListColumn treeListColumn40 = new TreelistView.TreeListColumn("Dimensions", "Dimensions"); - TreelistView.TreeListColumn treeListColumn41 = new TreelistView.TreeListColumn("Format", "Format"); - TreelistView.TreeListColumn treeListColumn42 = new TreelistView.TreeListColumn("Access", "Access"); - TreelistView.TreeListColumn treeListColumn43 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn44 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn45 = new TreelistView.TreeListColumn("Resource", "Resource"); - TreelistView.TreeListColumn treeListColumn46 = new TreelistView.TreeListColumn("Type", "Type"); - TreelistView.TreeListColumn treeListColumn47 = new TreelistView.TreeListColumn("Width", "Width"); - TreelistView.TreeListColumn treeListColumn48 = new TreelistView.TreeListColumn("Height", "Height"); - TreelistView.TreeListColumn treeListColumn49 = new TreelistView.TreeListColumn("Depth", "Depth"); - TreelistView.TreeListColumn treeListColumn50 = new TreelistView.TreeListColumn("Array Size", "Array Size"); - TreelistView.TreeListColumn treeListColumn51 = new TreelistView.TreeListColumn("Format", "Format"); - TreelistView.TreeListColumn treeListColumn52 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn53 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn54 = new TreelistView.TreeListColumn("Addressing", "Addressing"); - TreelistView.TreeListColumn treeListColumn55 = new TreelistView.TreeListColumn("Min Filter", "Min Filter"); - TreelistView.TreeListColumn treeListColumn56 = new TreelistView.TreeListColumn("Mag Filter", "Mag Filter"); - TreelistView.TreeListColumn treeListColumn57 = new TreelistView.TreeListColumn("LOD Clamp", "LOD Clamp"); - TreelistView.TreeListColumn treeListColumn58 = new TreelistView.TreeListColumn("LOD Bias", "LOD Bias"); - TreelistView.TreeListColumn treeListColumn59 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn60 = new TreelistView.TreeListColumn("Buffer", "Buffer"); - TreelistView.TreeListColumn treeListColumn61 = new TreelistView.TreeListColumn("Byte Range", "Byte Range"); - TreelistView.TreeListColumn treeListColumn62 = new TreelistView.TreeListColumn("Size", "Size"); - TreelistView.TreeListColumn treeListColumn63 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn64 = new TreelistView.TreeListColumn("Uniform", "Uniform"); - TreelistView.TreeListColumn treeListColumn65 = new TreelistView.TreeListColumn("Value", "Value"); - TreelistView.TreeListColumn treeListColumn66 = new TreelistView.TreeListColumn("BindingType", "Binding"); - TreelistView.TreeListColumn treeListColumn67 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn68 = new TreelistView.TreeListColumn("Resource", "Resource"); - TreelistView.TreeListColumn treeListColumn69 = new TreelistView.TreeListColumn("Dimensions", "Dimensions"); - TreelistView.TreeListColumn treeListColumn70 = new TreelistView.TreeListColumn("Format", "Format"); - TreelistView.TreeListColumn treeListColumn71 = new TreelistView.TreeListColumn("Access", "Access"); - TreelistView.TreeListColumn treeListColumn72 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn73 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn74 = new TreelistView.TreeListColumn("Resource", "Resource"); - TreelistView.TreeListColumn treeListColumn75 = new TreelistView.TreeListColumn("Type", "Type"); - TreelistView.TreeListColumn treeListColumn76 = new TreelistView.TreeListColumn("Width", "Width"); - TreelistView.TreeListColumn treeListColumn77 = new TreelistView.TreeListColumn("Height", "Height"); - TreelistView.TreeListColumn treeListColumn78 = new TreelistView.TreeListColumn("Depth", "Depth"); - TreelistView.TreeListColumn treeListColumn79 = new TreelistView.TreeListColumn("Array Size", "Array Size"); - TreelistView.TreeListColumn treeListColumn80 = new TreelistView.TreeListColumn("Format", "Format"); - TreelistView.TreeListColumn treeListColumn81 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn82 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn83 = new TreelistView.TreeListColumn("Addressing", "Addressing"); - TreelistView.TreeListColumn treeListColumn84 = new TreelistView.TreeListColumn("Min Filter", "Min Filter"); - TreelistView.TreeListColumn treeListColumn85 = new TreelistView.TreeListColumn("Mag Filter", "Mag Filter"); - TreelistView.TreeListColumn treeListColumn86 = new TreelistView.TreeListColumn("LOD Clamp", "LOD Clamp"); - TreelistView.TreeListColumn treeListColumn87 = new TreelistView.TreeListColumn("LOD Bias", "LOD Bias"); - TreelistView.TreeListColumn treeListColumn88 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn89 = new TreelistView.TreeListColumn("Buffer", "Buffer"); - TreelistView.TreeListColumn treeListColumn90 = new TreelistView.TreeListColumn("Byte Range", "Byte Range"); - TreelistView.TreeListColumn treeListColumn91 = new TreelistView.TreeListColumn("Size", "Size"); - TreelistView.TreeListColumn treeListColumn92 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn93 = new TreelistView.TreeListColumn("Uniform", "Uniform"); - TreelistView.TreeListColumn treeListColumn94 = new TreelistView.TreeListColumn("Value", "Value"); - TreelistView.TreeListColumn treeListColumn95 = new TreelistView.TreeListColumn("BindingType", "Binding"); - TreelistView.TreeListColumn treeListColumn96 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn97 = new TreelistView.TreeListColumn("Resource", "Resource"); - TreelistView.TreeListColumn treeListColumn98 = new TreelistView.TreeListColumn("Dimensions", "Dimensions"); - TreelistView.TreeListColumn treeListColumn99 = new TreelistView.TreeListColumn("Format", "Format"); - TreelistView.TreeListColumn treeListColumn100 = new TreelistView.TreeListColumn("Access", "Access"); - TreelistView.TreeListColumn treeListColumn101 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn102 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn103 = new TreelistView.TreeListColumn("Resource", "Resource"); - TreelistView.TreeListColumn treeListColumn104 = new TreelistView.TreeListColumn("Type", "Type"); - TreelistView.TreeListColumn treeListColumn105 = new TreelistView.TreeListColumn("Width", "Width"); - TreelistView.TreeListColumn treeListColumn106 = new TreelistView.TreeListColumn("Height", "Height"); - TreelistView.TreeListColumn treeListColumn107 = new TreelistView.TreeListColumn("Depth", "Depth"); - TreelistView.TreeListColumn treeListColumn108 = new TreelistView.TreeListColumn("Array Size", "Array Size"); - TreelistView.TreeListColumn treeListColumn109 = new TreelistView.TreeListColumn("Format", "Format"); - TreelistView.TreeListColumn treeListColumn110 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn111 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn112 = new TreelistView.TreeListColumn("Addressing", "Addressing"); - TreelistView.TreeListColumn treeListColumn113 = new TreelistView.TreeListColumn("Min Filter", "Min Filter"); - TreelistView.TreeListColumn treeListColumn114 = new TreelistView.TreeListColumn("Mag Filter", "Mag Filter"); - TreelistView.TreeListColumn treeListColumn115 = new TreelistView.TreeListColumn("LOD Clamp", "LOD Clamp"); - TreelistView.TreeListColumn treeListColumn116 = new TreelistView.TreeListColumn("LOD Bias", "LOD Bias"); - TreelistView.TreeListColumn treeListColumn117 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn118 = new TreelistView.TreeListColumn("Buffer", "Buffer"); - TreelistView.TreeListColumn treeListColumn119 = new TreelistView.TreeListColumn("Byte Range", "Byte Range"); - TreelistView.TreeListColumn treeListColumn120 = new TreelistView.TreeListColumn("Size", "Size"); - TreelistView.TreeListColumn treeListColumn121 = new TreelistView.TreeListColumn("Go", "Go"); + TreelistView.TreeListColumn treeListColumn15 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn16 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Resource", "Resource"))); + TreelistView.TreeListColumn treeListColumn17 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Type", "Type"))); + TreelistView.TreeListColumn treeListColumn18 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Width", "Width"))); + TreelistView.TreeListColumn treeListColumn19 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Height", "Height"))); + TreelistView.TreeListColumn treeListColumn20 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Depth", "Depth"))); + TreelistView.TreeListColumn treeListColumn21 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Array Size", "Array Size"))); + TreelistView.TreeListColumn treeListColumn22 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format"))); + TreelistView.TreeListColumn treeListColumn23 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn24 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn25 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Addressing", "Addressing"))); + TreelistView.TreeListColumn treeListColumn26 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Min Filter", "Min Filter"))); + TreelistView.TreeListColumn treeListColumn27 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Mag Filter", "Mag Filter"))); + TreelistView.TreeListColumn treeListColumn28 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("LOD Clamp", "LOD Clamp"))); + TreelistView.TreeListColumn treeListColumn29 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("LOD Bias", "LOD Bias"))); + TreelistView.TreeListColumn treeListColumn30 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn31 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Buffer", "Buffer"))); + TreelistView.TreeListColumn treeListColumn32 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Byte Range", "Byte Range"))); + TreelistView.TreeListColumn treeListColumn33 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Size", "Size"))); + TreelistView.TreeListColumn treeListColumn34 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn35 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Uniform", "Uniform"))); + TreelistView.TreeListColumn treeListColumn36 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Value", "Value"))); + TreelistView.TreeListColumn treeListColumn37 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("BindingType", "Binding"))); + TreelistView.TreeListColumn treeListColumn38 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn39 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Resource", "Resource"))); + TreelistView.TreeListColumn treeListColumn40 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Dimensions", "Dimensions"))); + TreelistView.TreeListColumn treeListColumn41 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format"))); + TreelistView.TreeListColumn treeListColumn42 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Access", "Access"))); + TreelistView.TreeListColumn treeListColumn43 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn44 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn45 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Resource", "Resource"))); + TreelistView.TreeListColumn treeListColumn46 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Type", "Type"))); + TreelistView.TreeListColumn treeListColumn47 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Width", "Width"))); + TreelistView.TreeListColumn treeListColumn48 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Height", "Height"))); + TreelistView.TreeListColumn treeListColumn49 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Depth", "Depth"))); + TreelistView.TreeListColumn treeListColumn50 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Array Size", "Array Size"))); + TreelistView.TreeListColumn treeListColumn51 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format"))); + TreelistView.TreeListColumn treeListColumn52 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn53 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn54 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Addressing", "Addressing"))); + TreelistView.TreeListColumn treeListColumn55 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Min Filter", "Min Filter"))); + TreelistView.TreeListColumn treeListColumn56 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Mag Filter", "Mag Filter"))); + TreelistView.TreeListColumn treeListColumn57 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("LOD Clamp", "LOD Clamp"))); + TreelistView.TreeListColumn treeListColumn58 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("LOD Bias", "LOD Bias"))); + TreelistView.TreeListColumn treeListColumn59 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn60 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Buffer", "Buffer"))); + TreelistView.TreeListColumn treeListColumn61 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Byte Range", "Byte Range"))); + TreelistView.TreeListColumn treeListColumn62 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Size", "Size"))); + TreelistView.TreeListColumn treeListColumn63 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn64 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Uniform", "Uniform"))); + TreelistView.TreeListColumn treeListColumn65 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Value", "Value"))); + TreelistView.TreeListColumn treeListColumn66 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("BindingType", "Binding"))); + TreelistView.TreeListColumn treeListColumn67 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn68 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Resource", "Resource"))); + TreelistView.TreeListColumn treeListColumn69 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Dimensions", "Dimensions"))); + TreelistView.TreeListColumn treeListColumn70 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format"))); + TreelistView.TreeListColumn treeListColumn71 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Access", "Access"))); + TreelistView.TreeListColumn treeListColumn72 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn73 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn74 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Resource", "Resource"))); + TreelistView.TreeListColumn treeListColumn75 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Type", "Type"))); + TreelistView.TreeListColumn treeListColumn76 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Width", "Width"))); + TreelistView.TreeListColumn treeListColumn77 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Height", "Height"))); + TreelistView.TreeListColumn treeListColumn78 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Depth", "Depth"))); + TreelistView.TreeListColumn treeListColumn79 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Array Size", "Array Size"))); + TreelistView.TreeListColumn treeListColumn80 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format"))); + TreelistView.TreeListColumn treeListColumn81 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn82 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn83 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Addressing", "Addressing"))); + TreelistView.TreeListColumn treeListColumn84 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Min Filter", "Min Filter"))); + TreelistView.TreeListColumn treeListColumn85 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Mag Filter", "Mag Filter"))); + TreelistView.TreeListColumn treeListColumn86 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("LOD Clamp", "LOD Clamp"))); + TreelistView.TreeListColumn treeListColumn87 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("LOD Bias", "LOD Bias"))); + TreelistView.TreeListColumn treeListColumn88 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn89 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Buffer", "Buffer"))); + TreelistView.TreeListColumn treeListColumn90 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Byte Range", "Byte Range"))); + TreelistView.TreeListColumn treeListColumn91 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Size", "Size"))); + TreelistView.TreeListColumn treeListColumn92 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn93 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Uniform", "Uniform"))); + TreelistView.TreeListColumn treeListColumn94 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Value", "Value"))); + TreelistView.TreeListColumn treeListColumn95 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("BindingType", "Binding"))); + TreelistView.TreeListColumn treeListColumn96 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn97 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Resource", "Resource"))); + TreelistView.TreeListColumn treeListColumn98 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Dimensions", "Dimensions"))); + TreelistView.TreeListColumn treeListColumn99 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format"))); + TreelistView.TreeListColumn treeListColumn100 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Access", "Access"))); + TreelistView.TreeListColumn treeListColumn101 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn102 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn103 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Resource", "Resource"))); + TreelistView.TreeListColumn treeListColumn104 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Type", "Type"))); + TreelistView.TreeListColumn treeListColumn105 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Width", "Width"))); + TreelistView.TreeListColumn treeListColumn106 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Height", "Height"))); + TreelistView.TreeListColumn treeListColumn107 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Depth", "Depth"))); + TreelistView.TreeListColumn treeListColumn108 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Array Size", "Array Size"))); + TreelistView.TreeListColumn treeListColumn109 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format"))); + TreelistView.TreeListColumn treeListColumn110 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn111 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn112 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Addressing", "Addressing"))); + TreelistView.TreeListColumn treeListColumn113 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Min Filter", "Min Filter"))); + TreelistView.TreeListColumn treeListColumn114 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Mag Filter", "Mag Filter"))); + TreelistView.TreeListColumn treeListColumn115 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("LOD Clamp", "LOD Clamp"))); + TreelistView.TreeListColumn treeListColumn116 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("LOD Bias", "LOD Bias"))); + TreelistView.TreeListColumn treeListColumn117 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn118 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Buffer", "Buffer"))); + TreelistView.TreeListColumn treeListColumn119 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Byte Range", "Byte Range"))); + TreelistView.TreeListColumn treeListColumn120 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Size", "Size"))); + TreelistView.TreeListColumn treeListColumn121 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GLPipelineStateViewer)); - TreelistView.TreeListColumn treeListColumn122 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn123 = new TreelistView.TreeListColumn("Buffer", "Buffer"); - TreelistView.TreeListColumn treeListColumn124 = new TreelistView.TreeListColumn("Length", "Length"); - TreelistView.TreeListColumn treeListColumn125 = new TreelistView.TreeListColumn("Offset", "Offset"); - TreelistView.TreeListColumn treeListColumn126 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn127 = new TreelistView.TreeListColumn("Uniform", "Uniform"); - TreelistView.TreeListColumn treeListColumn128 = new TreelistView.TreeListColumn("Value", "Value"); - TreelistView.TreeListColumn treeListColumn129 = new TreelistView.TreeListColumn("BindingType", "Binding"); - TreelistView.TreeListColumn treeListColumn130 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn131 = new TreelistView.TreeListColumn("Resource", "Resource"); - TreelistView.TreeListColumn treeListColumn132 = new TreelistView.TreeListColumn("Dimensions", "Dimensions"); - TreelistView.TreeListColumn treeListColumn133 = new TreelistView.TreeListColumn("Format", "Format"); - TreelistView.TreeListColumn treeListColumn134 = new TreelistView.TreeListColumn("Access", "Access"); - TreelistView.TreeListColumn treeListColumn135 = new TreelistView.TreeListColumn("Go", "Go"); + TreelistView.TreeListColumn treeListColumn122 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn123 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Buffer", "Buffer"))); + TreelistView.TreeListColumn treeListColumn124 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Length", "Length"))); + TreelistView.TreeListColumn treeListColumn125 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Offset", "Offset"))); + TreelistView.TreeListColumn treeListColumn126 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn127 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Uniform", "Uniform"))); + TreelistView.TreeListColumn treeListColumn128 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Value", "Value"))); + TreelistView.TreeListColumn treeListColumn129 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("BindingType", "Binding"))); + TreelistView.TreeListColumn treeListColumn130 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn131 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Resource", "Resource"))); + TreelistView.TreeListColumn treeListColumn132 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Dimensions", "Dimensions"))); + TreelistView.TreeListColumn treeListColumn133 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format"))); + TreelistView.TreeListColumn treeListColumn134 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Access", "Access"))); + TreelistView.TreeListColumn treeListColumn135 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); System.Windows.Forms.TableLayoutPanel tableLayoutPanel14; System.Windows.Forms.GroupBox multisampleGroup; System.Windows.Forms.TableLayoutPanel tableLayoutPanel8; @@ -196,104 +196,104 @@ System.Windows.Forms.Label label8; System.Windows.Forms.Label label23; System.Windows.Forms.GroupBox viewportGroup; - TreelistView.TreeListColumn treeListColumn136 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn137 = new TreelistView.TreeListColumn("X", "X"); - TreelistView.TreeListColumn treeListColumn138 = new TreelistView.TreeListColumn("Y", "Y"); - TreelistView.TreeListColumn treeListColumn139 = new TreelistView.TreeListColumn("Width", "Width"); - TreelistView.TreeListColumn treeListColumn140 = new TreelistView.TreeListColumn("Height", "Height"); - TreelistView.TreeListColumn treeListColumn141 = new TreelistView.TreeListColumn("MinDepth", "MinDepth"); - TreelistView.TreeListColumn treeListColumn142 = new TreelistView.TreeListColumn("MaxDepth", "MaxDepth"); + TreelistView.TreeListColumn treeListColumn136 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn137 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("X", "X"))); + TreelistView.TreeListColumn treeListColumn138 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Y", "Y"))); + TreelistView.TreeListColumn treeListColumn139 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Width", "Width"))); + TreelistView.TreeListColumn treeListColumn140 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Height", "Height"))); + TreelistView.TreeListColumn treeListColumn141 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("MinDepth", "MinDepth"))); + TreelistView.TreeListColumn treeListColumn142 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("MaxDepth", "MaxDepth"))); System.Windows.Forms.GroupBox scissorGroup; - TreelistView.TreeListColumn treeListColumn143 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn144 = new TreelistView.TreeListColumn("X", "X"); - TreelistView.TreeListColumn treeListColumn145 = new TreelistView.TreeListColumn("Y", "Y"); - TreelistView.TreeListColumn treeListColumn146 = new TreelistView.TreeListColumn("Width", "Width"); - TreelistView.TreeListColumn treeListColumn147 = new TreelistView.TreeListColumn("Height", "Height"); - TreelistView.TreeListColumn treeListColumn148 = new TreelistView.TreeListColumn("Enabled", "Enabled"); - TreelistView.TreeListColumn treeListColumn149 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn150 = new TreelistView.TreeListColumn("Resource", "Resource"); - TreelistView.TreeListColumn treeListColumn151 = new TreelistView.TreeListColumn("Type", "Type"); - TreelistView.TreeListColumn treeListColumn152 = new TreelistView.TreeListColumn("Width", "Width"); - TreelistView.TreeListColumn treeListColumn153 = new TreelistView.TreeListColumn("Height", "Height"); - TreelistView.TreeListColumn treeListColumn154 = new TreelistView.TreeListColumn("Depth", "Depth"); - TreelistView.TreeListColumn treeListColumn155 = new TreelistView.TreeListColumn("Array Size", "Array Size"); - TreelistView.TreeListColumn treeListColumn156 = new TreelistView.TreeListColumn("Format", "Format"); - TreelistView.TreeListColumn treeListColumn157 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn158 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn159 = new TreelistView.TreeListColumn("Addressing", "Addressing"); - TreelistView.TreeListColumn treeListColumn160 = new TreelistView.TreeListColumn("Min Filter", "Min Filter"); - TreelistView.TreeListColumn treeListColumn161 = new TreelistView.TreeListColumn("Mag Filter", "Mag Filter"); - TreelistView.TreeListColumn treeListColumn162 = new TreelistView.TreeListColumn("LOD Clamp", "LOD Clamp"); - TreelistView.TreeListColumn treeListColumn163 = new TreelistView.TreeListColumn("LOD Bias", "LOD Bias"); - TreelistView.TreeListColumn treeListColumn164 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn165 = new TreelistView.TreeListColumn("Buffer", "Buffer"); - TreelistView.TreeListColumn treeListColumn166 = new TreelistView.TreeListColumn("Byte Range", "Byte Range"); - TreelistView.TreeListColumn treeListColumn167 = new TreelistView.TreeListColumn("Size", "Size"); - TreelistView.TreeListColumn treeListColumn168 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn169 = new TreelistView.TreeListColumn("Uniform", "Uniform"); - TreelistView.TreeListColumn treeListColumn170 = new TreelistView.TreeListColumn("Value", "Value"); - TreelistView.TreeListColumn treeListColumn171 = new TreelistView.TreeListColumn("BindingType", "Binding"); - TreelistView.TreeListColumn treeListColumn172 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn173 = new TreelistView.TreeListColumn("Resource", "Resource"); - TreelistView.TreeListColumn treeListColumn174 = new TreelistView.TreeListColumn("Dimensions", "Dimensions"); - TreelistView.TreeListColumn treeListColumn175 = new TreelistView.TreeListColumn("Format", "Format"); - TreelistView.TreeListColumn treeListColumn176 = new TreelistView.TreeListColumn("Access", "Access"); - TreelistView.TreeListColumn treeListColumn177 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn178 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn179 = new TreelistView.TreeListColumn("Resource", "Resource"); - TreelistView.TreeListColumn treeListColumn180 = new TreelistView.TreeListColumn("Type", "Type"); - TreelistView.TreeListColumn treeListColumn181 = new TreelistView.TreeListColumn("Width", "Width"); - TreelistView.TreeListColumn treeListColumn182 = new TreelistView.TreeListColumn("Height", "Height"); - TreelistView.TreeListColumn treeListColumn183 = new TreelistView.TreeListColumn("Depth", "Depth"); - TreelistView.TreeListColumn treeListColumn184 = new TreelistView.TreeListColumn("Array Size", "Array Size"); - TreelistView.TreeListColumn treeListColumn185 = new TreelistView.TreeListColumn("Format", "Format"); - TreelistView.TreeListColumn treeListColumn186 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn187 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn188 = new TreelistView.TreeListColumn("Enabled", "Enabled"); - TreelistView.TreeListColumn treeListColumn189 = new TreelistView.TreeListColumn("Blend Src", "Blend Src"); - TreelistView.TreeListColumn treeListColumn190 = new TreelistView.TreeListColumn("Blend Dst", "Blend Dst"); - TreelistView.TreeListColumn treeListColumn191 = new TreelistView.TreeListColumn("Blend Op", "Blend Op"); - TreelistView.TreeListColumn treeListColumn192 = new TreelistView.TreeListColumn("Alpha Blend Src", "Alpha Blend Src"); - TreelistView.TreeListColumn treeListColumn193 = new TreelistView.TreeListColumn("Alpha Blend Dst", "Alpha Blend Dst"); - TreelistView.TreeListColumn treeListColumn194 = new TreelistView.TreeListColumn("Alpha Blend Op", "Alpha Blend Op"); - TreelistView.TreeListColumn treeListColumn195 = new TreelistView.TreeListColumn("Write Mask", "Write Mask"); - TreelistView.TreeListColumn treeListColumn196 = new TreelistView.TreeListColumn("Face", "Face"); - TreelistView.TreeListColumn treeListColumn197 = new TreelistView.TreeListColumn("Func", "Func"); - TreelistView.TreeListColumn treeListColumn198 = new TreelistView.TreeListColumn("Fail", "Fail"); - TreelistView.TreeListColumn treeListColumn199 = new TreelistView.TreeListColumn("Depth Fail", "Depth Fail"); - TreelistView.TreeListColumn treeListColumn200 = new TreelistView.TreeListColumn("Pass", "Pass"); - TreelistView.TreeListColumn treeListColumn201 = new TreelistView.TreeListColumn("Ref", "Ref"); - TreelistView.TreeListColumn treeListColumn202 = new TreelistView.TreeListColumn("Write Mask", "Write Mask"); - TreelistView.TreeListColumn treeListColumn203 = new TreelistView.TreeListColumn("Val Mask", "Val Mask"); - TreelistView.TreeListColumn treeListColumn204 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn205 = new TreelistView.TreeListColumn("Resource", "Resource"); - TreelistView.TreeListColumn treeListColumn206 = new TreelistView.TreeListColumn("Type", "Type"); - TreelistView.TreeListColumn treeListColumn207 = new TreelistView.TreeListColumn("Width", "Width"); - TreelistView.TreeListColumn treeListColumn208 = new TreelistView.TreeListColumn("Height", "Height"); - TreelistView.TreeListColumn treeListColumn209 = new TreelistView.TreeListColumn("Depth", "Depth"); - TreelistView.TreeListColumn treeListColumn210 = new TreelistView.TreeListColumn("Array Size", "Array Size"); - TreelistView.TreeListColumn treeListColumn211 = new TreelistView.TreeListColumn("Format", "Format"); - TreelistView.TreeListColumn treeListColumn212 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn213 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn214 = new TreelistView.TreeListColumn("Addressing", "Addressing"); - TreelistView.TreeListColumn treeListColumn215 = new TreelistView.TreeListColumn("Min Filter", "Min Filter"); - TreelistView.TreeListColumn treeListColumn216 = new TreelistView.TreeListColumn("Mag Filter", "Mag Filter"); - TreelistView.TreeListColumn treeListColumn217 = new TreelistView.TreeListColumn("LOD Clamp", "LOD Clamp"); - TreelistView.TreeListColumn treeListColumn218 = new TreelistView.TreeListColumn("LOD Bias", "LOD Bias"); - TreelistView.TreeListColumn treeListColumn219 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn220 = new TreelistView.TreeListColumn("Buffer", "Buffer"); - TreelistView.TreeListColumn treeListColumn221 = new TreelistView.TreeListColumn("Byte Range", "Byte Range"); - TreelistView.TreeListColumn treeListColumn222 = new TreelistView.TreeListColumn("Size", "Size"); - TreelistView.TreeListColumn treeListColumn223 = new TreelistView.TreeListColumn("Go", "Go"); - TreelistView.TreeListColumn treeListColumn224 = new TreelistView.TreeListColumn("Uniform", "Uniform"); - TreelistView.TreeListColumn treeListColumn225 = new TreelistView.TreeListColumn("Value", "Value"); - TreelistView.TreeListColumn treeListColumn226 = new TreelistView.TreeListColumn("BindingType", "Binding"); - TreelistView.TreeListColumn treeListColumn227 = new TreelistView.TreeListColumn("Slot", "Slot"); - TreelistView.TreeListColumn treeListColumn228 = new TreelistView.TreeListColumn("Resource", "Resource"); - TreelistView.TreeListColumn treeListColumn229 = new TreelistView.TreeListColumn("Dimensions", "Dimensions"); - TreelistView.TreeListColumn treeListColumn230 = new TreelistView.TreeListColumn("Format", "Format"); - TreelistView.TreeListColumn treeListColumn231 = new TreelistView.TreeListColumn("Access", "Access"); - TreelistView.TreeListColumn treeListColumn232 = new TreelistView.TreeListColumn("Go", "Go"); + TreelistView.TreeListColumn treeListColumn143 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn144 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("X", "X"))); + TreelistView.TreeListColumn treeListColumn145 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Y", "Y"))); + TreelistView.TreeListColumn treeListColumn146 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Width", "Width"))); + TreelistView.TreeListColumn treeListColumn147 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Height", "Height"))); + TreelistView.TreeListColumn treeListColumn148 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Enabled", "Enabled"))); + TreelistView.TreeListColumn treeListColumn149 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn150 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Resource", "Resource"))); + TreelistView.TreeListColumn treeListColumn151 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Type", "Type"))); + TreelistView.TreeListColumn treeListColumn152 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Width", "Width"))); + TreelistView.TreeListColumn treeListColumn153 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Height", "Height"))); + TreelistView.TreeListColumn treeListColumn154 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Depth", "Depth"))); + TreelistView.TreeListColumn treeListColumn155 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Array Size", "Array Size"))); + TreelistView.TreeListColumn treeListColumn156 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format"))); + TreelistView.TreeListColumn treeListColumn157 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn158 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn159 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Addressing", "Addressing"))); + TreelistView.TreeListColumn treeListColumn160 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Min Filter", "Min Filter"))); + TreelistView.TreeListColumn treeListColumn161 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Mag Filter", "Mag Filter"))); + TreelistView.TreeListColumn treeListColumn162 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("LOD Clamp", "LOD Clamp"))); + TreelistView.TreeListColumn treeListColumn163 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("LOD Bias", "LOD Bias"))); + TreelistView.TreeListColumn treeListColumn164 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn165 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Buffer", "Buffer"))); + TreelistView.TreeListColumn treeListColumn166 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Byte Range", "Byte Range"))); + TreelistView.TreeListColumn treeListColumn167 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Size", "Size"))); + TreelistView.TreeListColumn treeListColumn168 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn169 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Uniform", "Uniform"))); + TreelistView.TreeListColumn treeListColumn170 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Value", "Value"))); + TreelistView.TreeListColumn treeListColumn171 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("BindingType", "Binding"))); + TreelistView.TreeListColumn treeListColumn172 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn173 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Resource", "Resource"))); + TreelistView.TreeListColumn treeListColumn174 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Dimensions", "Dimensions"))); + TreelistView.TreeListColumn treeListColumn175 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format"))); + TreelistView.TreeListColumn treeListColumn176 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Access", "Access"))); + TreelistView.TreeListColumn treeListColumn177 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn178 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn179 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Resource", "Resource"))); + TreelistView.TreeListColumn treeListColumn180 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Type", "Type"))); + TreelistView.TreeListColumn treeListColumn181 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Width", "Width"))); + TreelistView.TreeListColumn treeListColumn182 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Height", "Height"))); + TreelistView.TreeListColumn treeListColumn183 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Depth", "Depth"))); + TreelistView.TreeListColumn treeListColumn184 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Array Size", "Array Size"))); + TreelistView.TreeListColumn treeListColumn185 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format"))); + TreelistView.TreeListColumn treeListColumn186 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn187 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn188 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Enabled", "Enabled"))); + TreelistView.TreeListColumn treeListColumn189 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Colour Src", "Colour Src"))); + TreelistView.TreeListColumn treeListColumn190 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Colour Dst", "Colour Dst"))); + TreelistView.TreeListColumn treeListColumn191 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Colour Op", "Colour Op"))); + TreelistView.TreeListColumn treeListColumn192 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Alpha Src", "Alpha Src"))); + TreelistView.TreeListColumn treeListColumn193 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Alpha Dst", "Alpha Dst"))); + TreelistView.TreeListColumn treeListColumn194 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Alpha Op", "Alpha Op"))); + TreelistView.TreeListColumn treeListColumn195 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Write Mask", "Write Mask"))); + TreelistView.TreeListColumn treeListColumn196 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Face", "Face"))); + TreelistView.TreeListColumn treeListColumn197 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Func", "Func"))); + TreelistView.TreeListColumn treeListColumn198 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Fail", "Fail"))); + TreelistView.TreeListColumn treeListColumn199 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Depth Fail", "Depth Fail"))); + TreelistView.TreeListColumn treeListColumn200 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Pass", "Pass"))); + TreelistView.TreeListColumn treeListColumn201 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Ref", "Ref"))); + TreelistView.TreeListColumn treeListColumn202 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Write Mask", "Write Mask"))); + TreelistView.TreeListColumn treeListColumn203 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Val Mask", "Val Mask"))); + TreelistView.TreeListColumn treeListColumn204 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn205 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Resource", "Resource"))); + TreelistView.TreeListColumn treeListColumn206 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Type", "Type"))); + TreelistView.TreeListColumn treeListColumn207 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Width", "Width"))); + TreelistView.TreeListColumn treeListColumn208 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Height", "Height"))); + TreelistView.TreeListColumn treeListColumn209 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Depth", "Depth"))); + TreelistView.TreeListColumn treeListColumn210 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Array Size", "Array Size"))); + TreelistView.TreeListColumn treeListColumn211 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format"))); + TreelistView.TreeListColumn treeListColumn212 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn213 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn214 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Addressing", "Addressing"))); + TreelistView.TreeListColumn treeListColumn215 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Min Filter", "Min Filter"))); + TreelistView.TreeListColumn treeListColumn216 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Mag Filter", "Mag Filter"))); + TreelistView.TreeListColumn treeListColumn217 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("LOD Clamp", "LOD Clamp"))); + TreelistView.TreeListColumn treeListColumn218 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("LOD Bias", "LOD Bias"))); + TreelistView.TreeListColumn treeListColumn219 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn220 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Buffer", "Buffer"))); + TreelistView.TreeListColumn treeListColumn221 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Byte Range", "Byte Range"))); + TreelistView.TreeListColumn treeListColumn222 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Size", "Size"))); + TreelistView.TreeListColumn treeListColumn223 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); + TreelistView.TreeListColumn treeListColumn224 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Uniform", "Uniform"))); + TreelistView.TreeListColumn treeListColumn225 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Value", "Value"))); + TreelistView.TreeListColumn treeListColumn226 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("BindingType", "Binding"))); + TreelistView.TreeListColumn treeListColumn227 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Slot", "Slot"))); + TreelistView.TreeListColumn treeListColumn228 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Resource", "Resource"))); + TreelistView.TreeListColumn treeListColumn229 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Dimensions", "Dimensions"))); + TreelistView.TreeListColumn treeListColumn230 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Format", "Format"))); + TreelistView.TreeListColumn treeListColumn231 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Access", "Access"))); + TreelistView.TreeListColumn treeListColumn232 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Go", "Go"))); this.pipeFlow = new renderdocui.Controls.PipelineFlowchart(); this.flowLayoutPanel6 = new System.Windows.Forms.FlowLayoutPanel(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); @@ -349,6 +349,9 @@ this.tcsSubroutines = new TreelistView.TreeListView(); this.tcsReadWriteGroup = new System.Windows.Forms.GroupBox(); this.tcsReadWrite = new TreelistView.TreeListView(); + this.tabTES = new System.Windows.Forms.TabPage(); + this.panel4 = new System.Windows.Forms.Panel(); + this.tesTable = new System.Windows.Forms.TableLayoutPanel(); this.tesShaderGroup = new System.Windows.Forms.GroupBox(); this.tesShaderFlow = new System.Windows.Forms.FlowLayoutPanel(); this.tesShader = new System.Windows.Forms.Label(); @@ -360,9 +363,6 @@ this.tesSamplers = new TreelistView.TreeListView(); this.tesCBuffersGroup = new System.Windows.Forms.GroupBox(); this.tesCBuffers = new TreelistView.TreeListView(); - this.tabTES = new System.Windows.Forms.TabPage(); - this.panel4 = new System.Windows.Forms.Panel(); - this.tesTable = new System.Windows.Forms.TableLayoutPanel(); this.tesSubroutinesGroup = new System.Windows.Forms.GroupBox(); this.tesSubroutines = new TreelistView.TreeListView(); this.tesReadWriteGroup = new System.Windows.Forms.GroupBox(); @@ -575,6 +575,9 @@ ((System.ComponentModel.ISupportInitialize)(this.tcsSubroutines)).BeginInit(); this.tcsReadWriteGroup.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tcsReadWrite)).BeginInit(); + this.tabTES.SuspendLayout(); + this.panel4.SuspendLayout(); + this.tesTable.SuspendLayout(); this.tesShaderGroup.SuspendLayout(); this.tesShaderFlow.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tesShaderCog)).BeginInit(); @@ -585,9 +588,6 @@ ((System.ComponentModel.ISupportInitialize)(this.tesSamplers)).BeginInit(); this.tesCBuffersGroup.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tesCBuffers)).BeginInit(); - this.tabTES.SuspendLayout(); - this.panel4.SuspendLayout(); - this.tesTable.SuspendLayout(); this.tesSubroutinesGroup.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tesSubroutines)).BeginInit(); this.tesReadWriteGroup.SuspendLayout(); @@ -974,15 +974,15 @@ // inputLayouts // treeListColumn8.AutoSizeMinSize = 0; - treeListColumn8.Width = 40; + treeListColumn8.Width = 50; treeListColumn9.AutoSizeMinSize = 0; - treeListColumn9.Width = 50; + treeListColumn9.Width = 60; treeListColumn10.AutoSizeMinSize = 0; treeListColumn10.Width = 200; treeListColumn11.AutoSizeMinSize = 0; treeListColumn11.Width = 200; treeListColumn12.AutoSizeMinSize = 0; - treeListColumn12.Width = 80; + treeListColumn12.Width = 90; treeListColumn13.AutoSize = true; treeListColumn13.AutoSizeMinSize = 0; treeListColumn13.Width = 150; @@ -1182,7 +1182,7 @@ treeListColumn20.AutoSizeMinSize = 0; treeListColumn20.Width = 50; treeListColumn21.AutoSizeMinSize = 0; - treeListColumn21.Width = 75; + treeListColumn21.Width = 85; treeListColumn22.AutoSizeMinSize = 0; treeListColumn22.Width = 200; treeListColumn23.AutoSizeMinSize = 0; @@ -1238,9 +1238,9 @@ treeListColumn26.AutoSizeMinSize = 0; treeListColumn26.Width = 250; treeListColumn27.AutoSizeMinSize = 0; - treeListColumn27.Width = 75; + treeListColumn27.Width = 90; treeListColumn28.AutoSizeMinSize = 0; - treeListColumn28.Width = 75; + treeListColumn28.Width = 100; treeListColumn29.AutoSize = true; treeListColumn29.AutoSizeMinSize = 50; treeListColumn29.Width = 50; @@ -1551,7 +1551,7 @@ treeListColumn49.AutoSizeMinSize = 0; treeListColumn49.Width = 50; treeListColumn50.AutoSizeMinSize = 0; - treeListColumn50.Width = 75; + treeListColumn50.Width = 85; treeListColumn51.AutoSizeMinSize = 0; treeListColumn51.Width = 200; treeListColumn52.AutoSizeMinSize = 0; @@ -1607,9 +1607,9 @@ treeListColumn55.AutoSizeMinSize = 0; treeListColumn55.Width = 250; treeListColumn56.AutoSizeMinSize = 0; - treeListColumn56.Width = 75; + treeListColumn56.Width = 90; treeListColumn57.AutoSizeMinSize = 0; - treeListColumn57.Width = 75; + treeListColumn57.Width = 100; treeListColumn58.AutoSize = true; treeListColumn58.AutoSizeMinSize = 50; treeListColumn58.Width = 50; @@ -1696,7 +1696,7 @@ this.tcsSubroutinesGroup.Dock = System.Windows.Forms.DockStyle.Fill; this.tcsSubroutinesGroup.Location = new System.Drawing.Point(3, 386); this.tcsSubroutinesGroup.Name = "tcsSubroutinesGroup"; - this.tcsSubroutinesGroup.Size = new System.Drawing.Size(572, 105); + this.tcsSubroutinesGroup.Size = new System.Drawing.Size(1151, 105); this.tcsSubroutinesGroup.TabIndex = 16; this.tcsSubroutinesGroup.TabStop = false; this.tcsSubroutinesGroup.Text = "Shader Subroutines"; @@ -1717,7 +1717,7 @@ this.tcsSubroutines.Name = "tcsSubroutines"; this.tcsSubroutines.RowOptions.ItemHeight = 20; this.tcsSubroutines.RowOptions.ShowHeader = false; - this.tcsSubroutines.Size = new System.Drawing.Size(566, 86); + this.tcsSubroutines.Size = new System.Drawing.Size(1145, 86); this.tcsSubroutines.TabIndex = 4; this.tcsSubroutines.Text = "Shader Subroutines"; this.tcsSubroutines.TreeColumn = -1; @@ -1783,6 +1783,51 @@ this.tcsReadWrite.Leave += new System.EventHandler(this.disableSelection_Leave); this.tcsReadWrite.MouseClick += new System.Windows.Forms.MouseEventHandler(this.hideDisabledEmpty_MouseClick); // + // tabTES + // + this.tabTES.Controls.Add(this.panel4); + this.tabTES.Location = new System.Drawing.Point(4, 22); + this.tabTES.Name = "tabTES"; + this.tabTES.Size = new System.Drawing.Size(1157, 605); + this.tabTES.TabIndex = 3; + this.tabTES.Text = "Tess. Eval. Shader"; + this.tabTES.UseVisualStyleBackColor = true; + // + // panel4 + // + this.panel4.AutoScroll = true; + this.panel4.AutoScrollMinSize = new System.Drawing.Size(0, 500); + this.panel4.Controls.Add(this.tesTable); + this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel4.Location = new System.Drawing.Point(0, 0); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(1157, 605); + this.panel4.TabIndex = 4; + // + // tesTable + // + this.tesTable.ColumnCount = 1; + this.tesTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tesTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tesTable.Controls.Add(this.tesShaderGroup, 0, 0); + this.tesTable.Controls.Add(this.tesTexturesGroup, 0, 1); + this.tesTable.Controls.Add(this.tesSamplersGroup, 0, 2); + this.tesTable.Controls.Add(this.tesCBuffersGroup, 0, 3); + this.tesTable.Controls.Add(this.tesSubroutinesGroup, 0, 4); + this.tesTable.Controls.Add(this.tesReadWriteGroup, 0, 5); + this.tesTable.Dock = System.Windows.Forms.DockStyle.Fill; + this.tesTable.Location = new System.Drawing.Point(0, 0); + this.tesTable.Name = "tesTable"; + this.tesTable.RowCount = 6; + this.tesTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F)); + this.tesTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tesTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tesTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tesTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tesTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tesTable.Size = new System.Drawing.Size(1157, 605); + this.tesTable.TabIndex = 1; + // // tesShaderGroup // this.tesShaderGroup.Controls.Add(this.tesShaderFlow); @@ -1877,7 +1922,7 @@ treeListColumn78.AutoSizeMinSize = 0; treeListColumn78.Width = 50; treeListColumn79.AutoSizeMinSize = 0; - treeListColumn79.Width = 75; + treeListColumn79.Width = 85; treeListColumn80.AutoSizeMinSize = 0; treeListColumn80.Width = 200; treeListColumn81.AutoSizeMinSize = 0; @@ -1933,9 +1978,9 @@ treeListColumn84.AutoSizeMinSize = 0; treeListColumn84.Width = 250; treeListColumn85.AutoSizeMinSize = 0; - treeListColumn85.Width = 75; + treeListColumn85.Width = 90; treeListColumn86.AutoSizeMinSize = 0; - treeListColumn86.Width = 75; + treeListColumn86.Width = 100; treeListColumn87.AutoSize = true; treeListColumn87.AutoSizeMinSize = 50; treeListColumn87.Width = 50; @@ -2016,58 +2061,13 @@ this.tesCBuffers.Leave += new System.EventHandler(this.disableSelection_Leave); this.tesCBuffers.MouseClick += new System.Windows.Forms.MouseEventHandler(this.hideDisabledEmpty_MouseClick); // - // tabTES - // - this.tabTES.Controls.Add(this.panel4); - this.tabTES.Location = new System.Drawing.Point(4, 22); - this.tabTES.Name = "tabTES"; - this.tabTES.Size = new System.Drawing.Size(1157, 605); - this.tabTES.TabIndex = 3; - this.tabTES.Text = "Tess. Eval. Shader"; - this.tabTES.UseVisualStyleBackColor = true; - // - // panel4 - // - this.panel4.AutoScroll = true; - this.panel4.AutoScrollMinSize = new System.Drawing.Size(0, 500); - this.panel4.Controls.Add(this.tesTable); - this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(0, 0); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(1157, 605); - this.panel4.TabIndex = 4; - // - // tesTable - // - this.tesTable.ColumnCount = 1; - this.tesTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tesTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tesTable.Controls.Add(this.tesShaderGroup, 0, 0); - this.tesTable.Controls.Add(this.tesTexturesGroup, 0, 1); - this.tesTable.Controls.Add(this.tesSamplersGroup, 0, 2); - this.tesTable.Controls.Add(this.tesCBuffersGroup, 0, 3); - this.tesTable.Controls.Add(this.tesSubroutinesGroup, 0, 4); - this.tesTable.Controls.Add(this.tesReadWriteGroup, 0, 5); - this.tesTable.Dock = System.Windows.Forms.DockStyle.Fill; - this.tesTable.Location = new System.Drawing.Point(0, 0); - this.tesTable.Name = "tesTable"; - this.tesTable.RowCount = 6; - this.tesTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F)); - this.tesTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tesTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tesTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tesTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tesTable.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.tesTable.Size = new System.Drawing.Size(1157, 605); - this.tesTable.TabIndex = 1; - // // tesSubroutinesGroup // this.tesSubroutinesGroup.Controls.Add(this.tesSubroutines); this.tesSubroutinesGroup.Dock = System.Windows.Forms.DockStyle.Fill; this.tesSubroutinesGroup.Location = new System.Drawing.Point(3, 386); this.tesSubroutinesGroup.Name = "tesSubroutinesGroup"; - this.tesSubroutinesGroup.Size = new System.Drawing.Size(572, 105); + this.tesSubroutinesGroup.Size = new System.Drawing.Size(1151, 105); this.tesSubroutinesGroup.TabIndex = 16; this.tesSubroutinesGroup.TabStop = false; this.tesSubroutinesGroup.Text = "Shader Subroutines"; @@ -2088,7 +2088,7 @@ this.tesSubroutines.Name = "tesSubroutines"; this.tesSubroutines.RowOptions.ItemHeight = 20; this.tesSubroutines.RowOptions.ShowHeader = false; - this.tesSubroutines.Size = new System.Drawing.Size(566, 86); + this.tesSubroutines.Size = new System.Drawing.Size(1145, 86); this.tesSubroutines.TabIndex = 4; this.tesSubroutines.Text = "Shader Subroutines"; this.tesSubroutines.TreeColumn = -1; @@ -2296,7 +2296,7 @@ treeListColumn107.AutoSizeMinSize = 0; treeListColumn107.Width = 50; treeListColumn108.AutoSizeMinSize = 0; - treeListColumn108.Width = 75; + treeListColumn108.Width = 85; treeListColumn109.AutoSizeMinSize = 0; treeListColumn109.Width = 200; treeListColumn110.AutoSizeMinSize = 0; @@ -2353,9 +2353,9 @@ treeListColumn113.AutoSizeMinSize = 0; treeListColumn113.Width = 250; treeListColumn114.AutoSizeMinSize = 0; - treeListColumn114.Width = 75; + treeListColumn114.Width = 90; treeListColumn115.AutoSizeMinSize = 0; - treeListColumn115.Width = 75; + treeListColumn115.Width = 100; treeListColumn116.AutoSize = true; treeListColumn116.AutoSizeMinSize = 50; treeListColumn116.Width = 50; @@ -2679,7 +2679,7 @@ tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 741F)); + tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 744F)); tableLayoutPanel8.Controls.Add(label26, 0, 1); tableLayoutPanel8.Controls.Add(label28, 0, 0); tableLayoutPanel8.Controls.Add(label29, 2, 0); @@ -2883,7 +2883,7 @@ rasterizerTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); rasterizerTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); rasterizerTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - rasterizerTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 741F)); + rasterizerTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 744F)); rasterizerTable.Controls.Add(this.pointSize, 0, 3); rasterizerTable.Controls.Add(label24, 0, 3); rasterizerTable.Controls.Add(this.frontCCW, 5, 0); @@ -3257,7 +3257,7 @@ treeListColumn140.AutoSizeMinSize = 0; treeListColumn140.Width = 50; treeListColumn141.AutoSizeMinSize = 0; - treeListColumn141.Width = 60; + treeListColumn141.Width = 70; treeListColumn142.AutoSize = true; treeListColumn142.AutoSizeMinSize = 60; treeListColumn142.Width = 60; @@ -3310,7 +3310,7 @@ treeListColumn147.AutoSizeMinSize = 50; treeListColumn147.Width = 50; treeListColumn148.AutoSizeMinSize = 0; - treeListColumn148.Width = 50; + treeListColumn148.Width = 60; this.scissors.Columns.AddRange(new TreelistView.TreeListColumn[] { treeListColumn143, treeListColumn144, @@ -3473,7 +3473,7 @@ treeListColumn154.AutoSizeMinSize = 0; treeListColumn154.Width = 50; treeListColumn155.AutoSizeMinSize = 0; - treeListColumn155.Width = 75; + treeListColumn155.Width = 85; treeListColumn156.AutoSizeMinSize = 0; treeListColumn156.Width = 200; treeListColumn157.AutoSizeMinSize = 0; @@ -3529,9 +3529,9 @@ treeListColumn160.AutoSizeMinSize = 0; treeListColumn160.Width = 250; treeListColumn161.AutoSizeMinSize = 0; - treeListColumn161.Width = 75; + treeListColumn161.Width = 90; treeListColumn162.AutoSizeMinSize = 0; - treeListColumn162.Width = 75; + treeListColumn162.Width = 100; treeListColumn163.AutoSize = true; treeListColumn163.AutoSizeMinSize = 50; treeListColumn163.Width = 50; @@ -3618,7 +3618,7 @@ this.fsSubroutinesGroup.Dock = System.Windows.Forms.DockStyle.Fill; this.fsSubroutinesGroup.Location = new System.Drawing.Point(3, 386); this.fsSubroutinesGroup.Name = "fsSubroutinesGroup"; - this.fsSubroutinesGroup.Size = new System.Drawing.Size(572, 105); + this.fsSubroutinesGroup.Size = new System.Drawing.Size(1151, 105); this.fsSubroutinesGroup.TabIndex = 16; this.fsSubroutinesGroup.TabStop = false; this.fsSubroutinesGroup.Text = "Shader Subroutines"; @@ -3639,7 +3639,7 @@ this.fsSubroutines.Name = "fsSubroutines"; this.fsSubroutines.RowOptions.ItemHeight = 20; this.fsSubroutines.RowOptions.ShowHeader = false; - this.fsSubroutines.Size = new System.Drawing.Size(566, 86); + this.fsSubroutines.Size = new System.Drawing.Size(1145, 86); this.fsSubroutines.TabIndex = 4; this.fsSubroutines.Text = "Shader Subroutines"; this.fsSubroutines.TreeColumn = -1; @@ -3771,7 +3771,7 @@ treeListColumn183.AutoSizeMinSize = 0; treeListColumn183.Width = 50; treeListColumn184.AutoSizeMinSize = 0; - treeListColumn184.Width = 75; + treeListColumn184.Width = 90; treeListColumn185.AutoSizeMinSize = 0; treeListColumn185.Width = 200; treeListColumn186.AutoSizeMinSize = 0; @@ -3786,6 +3786,7 @@ treeListColumn184, treeListColumn185, treeListColumn186}); + this.targetOutputs.Cursor = System.Windows.Forms.Cursors.Arrow; this.targetOutputs.Dock = System.Windows.Forms.DockStyle.Fill; this.targetOutputs.GridLineColour = System.Drawing.SystemColors.ControlDark; this.targetOutputs.Location = new System.Drawing.Point(3, 16); @@ -3822,7 +3823,7 @@ treeListColumn187.AutoSizeMinSize = 0; treeListColumn187.Width = 50; treeListColumn188.AutoSizeMinSize = 0; - treeListColumn188.Width = 50; + treeListColumn188.Width = 60; treeListColumn189.AutoSizeMinSize = 0; treeListColumn189.Width = 100; treeListColumn190.AutoSizeMinSize = 0; @@ -3848,6 +3849,7 @@ treeListColumn193, treeListColumn194, treeListColumn195}); + this.blendOperations.Cursor = System.Windows.Forms.Cursors.Arrow; this.blendOperations.Dock = System.Windows.Forms.DockStyle.Fill; this.blendOperations.GridLineColour = System.Drawing.SystemColors.ControlDark; this.blendOperations.Location = new System.Drawing.Point(3, 16); @@ -4164,6 +4166,7 @@ treeListColumn201, treeListColumn202, treeListColumn203}); + this.stencilFuncs.Cursor = System.Windows.Forms.Cursors.Arrow; this.stencilFuncs.Location = new System.Drawing.Point(3, 33); this.stencilFuncs.Name = "stencilFuncs"; this.stencilFuncs.RowOptions.ItemHeight = 20; @@ -4423,7 +4426,7 @@ treeListColumn209.AutoSizeMinSize = 0; treeListColumn209.Width = 50; treeListColumn210.AutoSizeMinSize = 0; - treeListColumn210.Width = 75; + treeListColumn210.Width = 85; treeListColumn211.AutoSizeMinSize = 0; treeListColumn211.Width = 200; treeListColumn212.AutoSizeMinSize = 0; @@ -4479,9 +4482,9 @@ treeListColumn215.AutoSizeMinSize = 0; treeListColumn215.Width = 250; treeListColumn216.AutoSizeMinSize = 0; - treeListColumn216.Width = 75; + treeListColumn216.Width = 90; treeListColumn217.AutoSizeMinSize = 0; - treeListColumn217.Width = 75; + treeListColumn217.Width = 100; treeListColumn218.AutoSize = true; treeListColumn218.AutoSizeMinSize = 50; treeListColumn218.Width = 50; @@ -4743,6 +4746,9 @@ ((System.ComponentModel.ISupportInitialize)(this.tcsSubroutines)).EndInit(); this.tcsReadWriteGroup.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.tcsReadWrite)).EndInit(); + this.tabTES.ResumeLayout(false); + this.panel4.ResumeLayout(false); + this.tesTable.ResumeLayout(false); this.tesShaderGroup.ResumeLayout(false); this.tesShaderFlow.ResumeLayout(false); this.tesShaderFlow.PerformLayout(); @@ -4754,9 +4760,6 @@ ((System.ComponentModel.ISupportInitialize)(this.tesSamplers)).EndInit(); this.tesCBuffersGroup.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.tesCBuffers)).EndInit(); - this.tabTES.ResumeLayout(false); - this.panel4.ResumeLayout(false); - this.tesTable.ResumeLayout(false); this.tesSubroutinesGroup.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.tesSubroutines)).EndInit(); this.tesReadWriteGroup.ResumeLayout(false); diff --git a/renderdocui/Windows/PipelineState/GLPipelineStateViewer.cs b/renderdocui/Windows/PipelineState/GLPipelineStateViewer.cs index c7a751641..59b1d115c 100644 --- a/renderdocui/Windows/PipelineState/GLPipelineStateViewer.cs +++ b/renderdocui/Windows/PipelineState/GLPipelineStateViewer.cs @@ -64,6 +64,30 @@ namespace renderdocui.Windows.PipelineState m_DockContent = c; + inputLayouts.Font = core.Config.PreferredFont; + iabuffers.Font = core.Config.PreferredFont; + + gsFeedback.Font = core.Config.PreferredFont; + + groupX.Font = groupY.Font = groupZ.Font = core.Config.PreferredFont; + threadX.Font = threadY.Font = threadZ.Font = core.Config.PreferredFont; + + vsShader.Font = vsTextures.Font = vsSamplers.Font = vsCBuffers.Font = vsSubroutines.Font = vsReadWrite.Font = core.Config.PreferredFont; + gsShader.Font = gsTextures.Font = gsSamplers.Font = gsCBuffers.Font = gsSubroutines.Font = gsReadWrite.Font = core.Config.PreferredFont; + tcsShader.Font = tcsTextures.Font = tcsSamplers.Font = tcsCBuffers.Font = tcsSubroutines.Font = tcsReadWrite.Font = core.Config.PreferredFont; + tesShader.Font = tesTextures.Font = tesSamplers.Font = tesCBuffers.Font = tesSubroutines.Font = tesReadWrite.Font = core.Config.PreferredFont; + fsShader.Font = fsTextures.Font = fsSamplers.Font = fsCBuffers.Font = fsSubroutines.Font = fsReadWrite.Font = core.Config.PreferredFont; + csShader.Font = csTextures.Font = csSamplers.Font = csCBuffers.Font = csSubroutines.Font = csReadWrite.Font = core.Config.PreferredFont; + + viewports.Font = core.Config.PreferredFont; + scissors.Font = core.Config.PreferredFont; + + targetOutputs.Font = core.Config.PreferredFont; + blendOperations.Font = core.Config.PreferredFont; + + pipeFlow.Font = new System.Drawing.Font(core.Config.PreferredFont.FontFamily, 11.25F, + System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + pipeFlow.SetStages(new KeyValuePair[] { new KeyValuePair("VTX", "Vertex Input"), new KeyValuePair("VS", "Vertex Shader"), @@ -110,14 +134,13 @@ namespace renderdocui.Windows.PipelineState restartIndex.Text = ""; - ClearShaderState(vsShader, vsTextures, vsSamplers, vsCBuffers, vsSubroutines); - ClearShaderState(gsShader, gsTextures, gsSamplers, gsCBuffers, gsSubroutines); - ClearShaderState(tesShader, tesTextures, tesSamplers, tesCBuffers, tesSubroutines); - ClearShaderState(tcsShader, tcsTextures, tcsSamplers, tcsCBuffers, tcsSubroutines); - ClearShaderState(fsShader, fsTextures, fsSamplers, fsCBuffers, fsSubroutines); - ClearShaderState(csShader, csTextures, csSamplers, csCBuffers, csSubroutines); + ClearShaderState(vsShader, vsTextures, vsSamplers, vsCBuffers, vsSubroutines, vsReadWrite); + ClearShaderState(gsShader, gsTextures, gsSamplers, gsCBuffers, gsSubroutines, gsReadWrite); + ClearShaderState(tesShader, tesTextures, tesSamplers, tesCBuffers, tesSubroutines, tesReadWrite); + ClearShaderState(tcsShader, tcsTextures, tcsSamplers, tcsCBuffers, tcsSubroutines, tcsReadWrite); + ClearShaderState(fsShader, fsTextures, fsSamplers, fsCBuffers, fsSubroutines, fsReadWrite); + ClearShaderState(csShader, csTextures, csSamplers, csCBuffers, csSubroutines, csReadWrite); - csReadWrite.Nodes.Clear(); gsFeedback.Nodes.Clear(); var tick = global::renderdocui.Properties.Resources.tick; @@ -190,14 +213,16 @@ namespace renderdocui.Windows.PipelineState node.Italic = true; } - private void ClearShaderState(Label shader, TreelistView.TreeListView resources, TreelistView.TreeListView samplers, - TreelistView.TreeListView cbuffers, TreelistView.TreeListView classes) + private void ClearShaderState(Label shader, TreelistView.TreeListView textures, TreelistView.TreeListView samplers, + TreelistView.TreeListView cbuffers, TreelistView.TreeListView subroutines, + TreelistView.TreeListView readwrites) { shader.Text = "Unbound"; - resources.Nodes.Clear(); + textures.Nodes.Clear(); samplers.Nodes.Clear(); cbuffers.Nodes.Clear(); - classes.Nodes.Clear(); + subroutines.Nodes.Clear(); + readwrites.Nodes.Clear(); } // Set a shader stage's resources and values @@ -297,7 +322,7 @@ namespace renderdocui.Windows.PipelineState a = texs[t].arraysize; format = texs[t].format.ToString(); name = texs[t].name; - typename = texs[t].resType.ToString(); + typename = texs[t].resType.Str(); if (texs[t].format.special && (texs[t].format.specialFormat == SpecialFormat.D24S8 || @@ -1328,7 +1353,7 @@ namespace renderdocui.Windows.PipelineState a = texs[t].arraysize; format = texs[t].format.ToString(); name = texs[t].name; - typename = texs[t].resType.ToString(); + typename = texs[t].resType.Str(); tag = texs[t]; @@ -1388,7 +1413,7 @@ namespace renderdocui.Windows.PipelineState a = texs[t].arraysize; format = texs[t].format.ToString(); name = texs[t].name; - typename = texs[t].resType.ToString(); + typename = texs[t].resType.Str(); tag = texs[t]; } diff --git a/renderdocui/Windows/PixelHistoryView.cs b/renderdocui/Windows/PixelHistoryView.cs index fbf569d91..e8c7f1214 100644 --- a/renderdocui/Windows/PixelHistoryView.cs +++ b/renderdocui/Windows/PixelHistoryView.cs @@ -69,6 +69,9 @@ namespace renderdocui.Windows m_Core = core; + events.Font = + core.Config.PreferredFont; + texture = tex; pixel = pt; rangeMin = rangemin; diff --git a/renderdocui/Windows/ShaderViewer.Designer.cs b/renderdocui/Windows/ShaderViewer.Designer.cs index 9742e2b61..65d98e021 100644 --- a/renderdocui/Windows/ShaderViewer.Designer.cs +++ b/renderdocui/Windows/ShaderViewer.Designer.cs @@ -29,42 +29,42 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - TreelistView.TreeListColumn treeListColumn21 = new TreelistView.TreeListColumn("Name", "Name"); - TreelistView.TreeListColumn treeListColumn22 = new TreelistView.TreeListColumn("Type", "Type"); - TreelistView.TreeListColumn treeListColumn23 = new TreelistView.TreeListColumn("Value", "Value"); - TreelistView.TreeListColumn treeListColumn24 = new TreelistView.TreeListColumn("Name", "Name"); - TreelistView.TreeListColumn treeListColumn25 = new TreelistView.TreeListColumn("Type", "Type"); - TreelistView.TreeListColumn treeListColumn26 = new TreelistView.TreeListColumn("Value", "Value"); - WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); - WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin2 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient8 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient9 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient5 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient10 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient11 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient12 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient6 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient13 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient14 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + TreelistView.TreeListColumn treeListColumn1 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Name", "Name"))); + TreelistView.TreeListColumn treeListColumn2 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Type", "Type"))); + TreelistView.TreeListColumn treeListColumn3 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Value", "Value"))); + TreelistView.TreeListColumn treeListColumn4 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Name", "Name"))); + TreelistView.TreeListColumn treeListColumn5 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Type", "Type"))); + TreelistView.TreeListColumn treeListColumn6 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Value", "Value"))); + WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); + WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShaderViewer)); - TreelistView.TreeListColumn treeListColumn27 = new TreelistView.TreeListColumn("Name", "Name"); - TreelistView.TreeListColumn treeListColumn28 = new TreelistView.TreeListColumn("Index", "Index"); - TreelistView.TreeListColumn treeListColumn29 = new TreelistView.TreeListColumn("Reg", "Reg"); - TreelistView.TreeListColumn treeListColumn30 = new TreelistView.TreeListColumn("Type", "Type"); - TreelistView.TreeListColumn treeListColumn31 = new TreelistView.TreeListColumn("SystemValue", "System Value"); - TreelistView.TreeListColumn treeListColumn32 = new TreelistView.TreeListColumn("Mask", "Mask"); - TreelistView.TreeListColumn treeListColumn33 = new TreelistView.TreeListColumn("Used", "Used"); - TreelistView.TreeListColumn treeListColumn34 = new TreelistView.TreeListColumn("Name", "Name"); - TreelistView.TreeListColumn treeListColumn35 = new TreelistView.TreeListColumn("Index", "Index"); - TreelistView.TreeListColumn treeListColumn36 = new TreelistView.TreeListColumn("Reg", "Reg"); - TreelistView.TreeListColumn treeListColumn37 = new TreelistView.TreeListColumn("Type", "Type"); - TreelistView.TreeListColumn treeListColumn38 = new TreelistView.TreeListColumn("SystemValue", "System Value"); - TreelistView.TreeListColumn treeListColumn39 = new TreelistView.TreeListColumn("Mask", "Mask"); - TreelistView.TreeListColumn treeListColumn40 = new TreelistView.TreeListColumn("Unused", "Unused"); + TreelistView.TreeListColumn treeListColumn7 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Name", "Name"))); + TreelistView.TreeListColumn treeListColumn8 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Index", "Index"))); + TreelistView.TreeListColumn treeListColumn9 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Reg", "Reg"))); + TreelistView.TreeListColumn treeListColumn10 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Type", "Type"))); + TreelistView.TreeListColumn treeListColumn11 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("SysValue", "SysValue"))); + TreelistView.TreeListColumn treeListColumn12 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Mask", "Mask"))); + TreelistView.TreeListColumn treeListColumn13 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Used", "Used"))); + TreelistView.TreeListColumn treeListColumn14 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Name", "Name"))); + TreelistView.TreeListColumn treeListColumn15 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Index", "Index"))); + TreelistView.TreeListColumn treeListColumn16 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Reg", "Reg"))); + TreelistView.TreeListColumn treeListColumn17 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Type", "Type"))); + TreelistView.TreeListColumn treeListColumn18 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("SysValue", "SysValue"))); + TreelistView.TreeListColumn treeListColumn19 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Mask", "Mask"))); + TreelistView.TreeListColumn treeListColumn20 = ((TreelistView.TreeListColumn)(new TreelistView.TreeListColumn("Unused", "Unused"))); this.variableBox = new System.Windows.Forms.GroupBox(); this.variableRegs = new TreelistView.TreeListView(); this.constantBox = new System.Windows.Forms.GroupBox(); @@ -133,17 +133,17 @@ // // variableRegs // - treeListColumn21.AutoSizeMinSize = 0; - treeListColumn21.Width = 105; - treeListColumn22.AutoSizeMinSize = 0; - treeListColumn22.Width = 57; - treeListColumn23.AutoSize = true; - treeListColumn23.AutoSizeMinSize = 0; - treeListColumn23.Width = 183; + treeListColumn1.AutoSizeMinSize = 0; + treeListColumn1.Width = 105; + treeListColumn2.AutoSizeMinSize = 0; + treeListColumn2.Width = 57; + treeListColumn3.AutoSize = true; + treeListColumn3.AutoSizeMinSize = 0; + treeListColumn3.Width = 183; this.variableRegs.Columns.AddRange(new TreelistView.TreeListColumn[] { - treeListColumn21, - treeListColumn22, - treeListColumn23}); + treeListColumn1, + treeListColumn2, + treeListColumn3}); this.variableRegs.Cursor = System.Windows.Forms.Cursors.Arrow; this.variableRegs.Dock = System.Windows.Forms.DockStyle.Fill; this.variableRegs.Location = new System.Drawing.Point(3, 16); @@ -168,17 +168,17 @@ // // constantRegs // - treeListColumn24.AutoSizeMinSize = 0; - treeListColumn24.Width = 109; - treeListColumn25.AutoSizeMinSize = 0; - treeListColumn25.Width = 57; - treeListColumn26.AutoSize = true; - treeListColumn26.AutoSizeMinSize = 0; - treeListColumn26.Width = 180; + treeListColumn4.AutoSizeMinSize = 0; + treeListColumn4.Width = 109; + treeListColumn5.AutoSizeMinSize = 0; + treeListColumn5.Width = 57; + treeListColumn6.AutoSize = true; + treeListColumn6.AutoSizeMinSize = 0; + treeListColumn6.Width = 180; this.constantRegs.Columns.AddRange(new TreelistView.TreeListColumn[] { - treeListColumn24, - treeListColumn25, - treeListColumn26}); + treeListColumn4, + treeListColumn5, + treeListColumn6}); this.constantRegs.Cursor = System.Windows.Forms.Cursors.Arrow; this.constantRegs.Dock = System.Windows.Forms.DockStyle.Fill; this.constantRegs.Location = new System.Drawing.Point(3, 16); @@ -201,52 +201,52 @@ this.dockPanel.Location = new System.Drawing.Point(3, 34); this.dockPanel.Name = "dockPanel"; this.dockPanel.Size = new System.Drawing.Size(424, 285); - dockPanelGradient4.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient4.StartColor = System.Drawing.SystemColors.ControlLight; - autoHideStripSkin2.DockStripGradient = dockPanelGradient4; - tabGradient8.EndColor = System.Drawing.SystemColors.Control; - tabGradient8.StartColor = System.Drawing.SystemColors.Control; - tabGradient8.TextColor = System.Drawing.SystemColors.ControlDarkDark; - autoHideStripSkin2.TabGradient = tabGradient8; - autoHideStripSkin2.TextFont = new System.Drawing.Font("Tahoma", 8.25F); - dockPanelSkin2.AutoHideStripSkin = autoHideStripSkin2; - tabGradient9.EndColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient9.StartColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient9.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient2.ActiveTabGradient = tabGradient9; - dockPanelGradient5.EndColor = System.Drawing.SystemColors.Control; - dockPanelGradient5.StartColor = System.Drawing.SystemColors.Control; - dockPaneStripGradient2.DockStripGradient = dockPanelGradient5; - tabGradient10.EndColor = System.Drawing.SystemColors.ControlLight; - tabGradient10.StartColor = System.Drawing.SystemColors.ControlLight; - tabGradient10.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient2.InactiveTabGradient = tabGradient10; - dockPaneStripSkin2.DocumentGradient = dockPaneStripGradient2; - dockPaneStripSkin2.TextFont = new System.Drawing.Font("Tahoma", 8.25F); - tabGradient11.EndColor = System.Drawing.SystemColors.ActiveCaption; - tabGradient11.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient11.StartColor = System.Drawing.SystemColors.GradientActiveCaption; - tabGradient11.TextColor = System.Drawing.SystemColors.ActiveCaptionText; - dockPaneStripToolWindowGradient2.ActiveCaptionGradient = tabGradient11; - tabGradient12.EndColor = System.Drawing.SystemColors.Control; - tabGradient12.StartColor = System.Drawing.SystemColors.Control; - tabGradient12.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient2.ActiveTabGradient = tabGradient12; - dockPanelGradient6.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient6.StartColor = System.Drawing.SystemColors.ControlLight; - dockPaneStripToolWindowGradient2.DockStripGradient = dockPanelGradient6; - tabGradient13.EndColor = System.Drawing.SystemColors.InactiveCaption; - tabGradient13.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient13.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient13.TextColor = System.Drawing.SystemColors.InactiveCaptionText; - dockPaneStripToolWindowGradient2.InactiveCaptionGradient = tabGradient13; - tabGradient14.EndColor = System.Drawing.Color.Transparent; - tabGradient14.StartColor = System.Drawing.Color.Transparent; - tabGradient14.TextColor = System.Drawing.SystemColors.ControlDarkDark; - dockPaneStripToolWindowGradient2.InactiveTabGradient = tabGradient14; - dockPaneStripSkin2.ToolWindowGradient = dockPaneStripToolWindowGradient2; - dockPanelSkin2.DockPaneStripSkin = dockPaneStripSkin2; - this.dockPanel.Skin = dockPanelSkin2; + dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight; + autoHideStripSkin1.DockStripGradient = dockPanelGradient1; + tabGradient1.EndColor = System.Drawing.SystemColors.Control; + tabGradient1.StartColor = System.Drawing.SystemColors.Control; + tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark; + autoHideStripSkin1.TabGradient = tabGradient1; + autoHideStripSkin1.TextFont = new System.Drawing.Font("Tahoma", 8.25F); + dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; + tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient1.ActiveTabGradient = tabGradient2; + dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; + dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control; + dockPaneStripGradient1.DockStripGradient = dockPanelGradient2; + tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight; + tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight; + tabGradient3.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient1.InactiveTabGradient = tabGradient3; + dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1; + dockPaneStripSkin1.TextFont = new System.Drawing.Font("Tahoma", 8.25F); + tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption; + tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption; + tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText; + dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4; + tabGradient5.EndColor = System.Drawing.SystemColors.Control; + tabGradient5.StartColor = System.Drawing.SystemColors.Control; + tabGradient5.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5; + dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight; + dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3; + tabGradient6.EndColor = System.Drawing.SystemColors.InactiveCaption; + tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient6.TextColor = System.Drawing.SystemColors.InactiveCaptionText; + dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6; + tabGradient7.EndColor = System.Drawing.Color.Transparent; + tabGradient7.StartColor = System.Drawing.Color.Transparent; + tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark; + dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7; + dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1; + dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; + this.dockPanel.Skin = dockPanelSkin1; this.dockPanel.TabIndex = 2; // // showWindows @@ -513,29 +513,29 @@ // // inSig // - treeListColumn27.AutoSize = true; - treeListColumn27.AutoSizeMinSize = 20; - treeListColumn27.Width = 100; - treeListColumn28.AutoSizeMinSize = 10; - treeListColumn28.Width = 50; - treeListColumn29.AutoSizeMinSize = 10; - treeListColumn29.Width = 50; - treeListColumn30.AutoSizeMinSize = 20; - treeListColumn30.Width = 60; - treeListColumn31.AutoSizeMinSize = 15; - treeListColumn31.Width = 75; - treeListColumn32.AutoSizeMinSize = 15; - treeListColumn32.Width = 50; - treeListColumn33.AutoSizeMinSize = 15; - treeListColumn33.Width = 50; + treeListColumn7.AutoSize = true; + treeListColumn7.AutoSizeMinSize = 20; + treeListColumn7.Width = 100; + treeListColumn8.AutoSizeMinSize = 10; + treeListColumn8.Width = 50; + treeListColumn9.AutoSizeMinSize = 10; + treeListColumn9.Width = 50; + treeListColumn10.AutoSizeMinSize = 20; + treeListColumn10.Width = 60; + treeListColumn11.AutoSizeMinSize = 15; + treeListColumn11.Width = 75; + treeListColumn12.AutoSizeMinSize = 15; + treeListColumn12.Width = 50; + treeListColumn13.AutoSizeMinSize = 15; + treeListColumn13.Width = 50; this.inSig.Columns.AddRange(new TreelistView.TreeListColumn[] { - treeListColumn27, - treeListColumn28, - treeListColumn29, - treeListColumn30, - treeListColumn31, - treeListColumn32, - treeListColumn33}); + treeListColumn7, + treeListColumn8, + treeListColumn9, + treeListColumn10, + treeListColumn11, + treeListColumn12, + treeListColumn13}); this.inSig.Cursor = System.Windows.Forms.Cursors.Arrow; this.inSig.Dock = System.Windows.Forms.DockStyle.Fill; this.inSig.Location = new System.Drawing.Point(3, 16); @@ -560,29 +560,29 @@ // // outSig // - treeListColumn34.AutoSize = true; - treeListColumn34.AutoSizeMinSize = 20; - treeListColumn34.Width = 100; - treeListColumn35.AutoSizeMinSize = 10; - treeListColumn35.Width = 50; - treeListColumn36.AutoSizeMinSize = 10; - treeListColumn36.Width = 50; - treeListColumn37.AutoSizeMinSize = 20; - treeListColumn37.Width = 60; - treeListColumn38.AutoSizeMinSize = 15; - treeListColumn38.Width = 75; - treeListColumn39.AutoSizeMinSize = 15; - treeListColumn39.Width = 50; - treeListColumn40.AutoSizeMinSize = 15; - treeListColumn40.Width = 50; + treeListColumn14.AutoSize = true; + treeListColumn14.AutoSizeMinSize = 20; + treeListColumn14.Width = 100; + treeListColumn15.AutoSizeMinSize = 10; + treeListColumn15.Width = 50; + treeListColumn16.AutoSizeMinSize = 10; + treeListColumn16.Width = 50; + treeListColumn17.AutoSizeMinSize = 20; + treeListColumn17.Width = 60; + treeListColumn18.AutoSizeMinSize = 15; + treeListColumn18.Width = 75; + treeListColumn19.AutoSizeMinSize = 15; + treeListColumn19.Width = 50; + treeListColumn20.AutoSizeMinSize = 15; + treeListColumn20.Width = 50; this.outSig.Columns.AddRange(new TreelistView.TreeListColumn[] { - treeListColumn34, - treeListColumn35, - treeListColumn36, - treeListColumn37, - treeListColumn38, - treeListColumn39, - treeListColumn40}); + treeListColumn14, + treeListColumn15, + treeListColumn16, + treeListColumn17, + treeListColumn18, + treeListColumn19, + treeListColumn20}); this.outSig.Cursor = System.Windows.Forms.Cursors.Arrow; this.outSig.Dock = System.Windows.Forms.DockStyle.Fill; this.outSig.Location = new System.Drawing.Point(3, 16); diff --git a/renderdocui/Windows/ShaderViewer.cs b/renderdocui/Windows/ShaderViewer.cs index 9ffb729af..84d46d153 100644 --- a/renderdocui/Windows/ShaderViewer.cs +++ b/renderdocui/Windows/ShaderViewer.cs @@ -210,6 +210,13 @@ namespace renderdocui.Windows { InitializeComponent(); + constantRegs.Font = + variableRegs.Font = + watchRegs.Font = + inSig.Font = + outSig.Font = + core.Config.PreferredFont; + Icon = global::renderdocui.Properties.Resources.icon; this.SuspendLayout(); @@ -344,12 +351,26 @@ namespace renderdocui.Windows { InitializeComponent(); + constantRegs.Font = + variableRegs.Font = + watchRegs.Font = + inSig.Font = + outSig.Font = + core.Config.PreferredFont; + Icon = global::renderdocui.Properties.Resources.icon; this.SuspendLayout(); mainLayout.Dock = DockStyle.Fill; + constantRegs.Font = + variableRegs.Font = + watchRegs.Font = + inSig.Font = + outSig.Font = + core.Config.PreferredFont; + m_Core = core; m_ShaderDetails = shader; m_Trace = trace; diff --git a/renderdocui/Windows/ShaderViewer.resx b/renderdocui/Windows/ShaderViewer.resx index 281e48cac..32eeb878f 100644 --- a/renderdocui/Windows/ShaderViewer.resx +++ b/renderdocui/Windows/ShaderViewer.resx @@ -154,9 +154,6 @@ 261, 17 - - 261, 17 - 354, 17 diff --git a/renderdocui/Windows/TextureViewer.cs b/renderdocui/Windows/TextureViewer.cs index f91aa7366..2da99f736 100644 --- a/renderdocui/Windows/TextureViewer.cs +++ b/renderdocui/Windows/TextureViewer.cs @@ -179,6 +179,18 @@ namespace renderdocui.Windows InitializeComponent(); + textureList.Font = + texturefilter.Font = + rangeBlack.Font = + rangeWhite.Font = + customShader.Font = + hdrMul.Font = + channels.Font = + mipLevel.Font = + sliceFace.Font = + zoomOption.Font = + core.Config.PreferredFont; + Icon = global::renderdocui.Properties.Resources.icon; textureList.m_Core = core; @@ -2946,7 +2958,7 @@ namespace renderdocui.Windows private void saveTex_Click(object sender, EventArgs e) { if (m_SaveDialog == null) - m_SaveDialog = new TextureSaveDialog(); + m_SaveDialog = new TextureSaveDialog(m_Core); m_SaveDialog.saveData.id = m_TexDisplay.texid; m_SaveDialog.saveData.slice.sliceIndex = (int)m_TexDisplay.sliceFace;