diff --git a/docs/how/how_custom_visualisation.rst b/docs/how/how_custom_visualisation.rst index f7f56327b..8f5185f8e 100644 --- a/docs/how/how_custom_visualisation.rst +++ b/docs/how/how_custom_visualisation.rst @@ -46,7 +46,7 @@ UV co-ordinates /* GLSL */ layout (location = 0) in vec2 uv; - void main() : SV_Target0 + void main() { // ... } diff --git a/renderdocui/Windows/ShaderViewer.Designer.cs b/renderdocui/Windows/ShaderViewer.Designer.cs index 90307301d..5c8a825c7 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 = new TreelistView.TreeListColumn("Name", "Name"); + TreelistView.TreeListColumn treeListColumn2 = new TreelistView.TreeListColumn("Type", "Type"); + TreelistView.TreeListColumn treeListColumn3 = new TreelistView.TreeListColumn("Value", "Value"); + TreelistView.TreeListColumn treeListColumn4 = new TreelistView.TreeListColumn("Name", "Name"); + TreelistView.TreeListColumn treeListColumn5 = new TreelistView.TreeListColumn("Type", "Type"); + TreelistView.TreeListColumn treeListColumn6 = 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("SysValue", "SysValue"); - 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("SysValue", "SysValue"); - TreelistView.TreeListColumn treeListColumn39 = new TreelistView.TreeListColumn("Mask", "Mask"); - TreelistView.TreeListColumn treeListColumn40 = new TreelistView.TreeListColumn("Unused", "Unused"); + TreelistView.TreeListColumn treeListColumn7 = new TreelistView.TreeListColumn("Name", "Name"); + TreelistView.TreeListColumn treeListColumn8 = new TreelistView.TreeListColumn("Index", "Index"); + TreelistView.TreeListColumn treeListColumn9 = new TreelistView.TreeListColumn("Reg", "Reg"); + TreelistView.TreeListColumn treeListColumn10 = new TreelistView.TreeListColumn("Type", "Type"); + TreelistView.TreeListColumn treeListColumn11 = new TreelistView.TreeListColumn("SysValue", "SysValue"); + TreelistView.TreeListColumn treeListColumn12 = new TreelistView.TreeListColumn("Mask", "Mask"); + TreelistView.TreeListColumn treeListColumn13 = new TreelistView.TreeListColumn("Used", "Used"); + TreelistView.TreeListColumn treeListColumn14 = new TreelistView.TreeListColumn("Name", "Name"); + TreelistView.TreeListColumn treeListColumn15 = new TreelistView.TreeListColumn("Index", "Index"); + TreelistView.TreeListColumn treeListColumn16 = new TreelistView.TreeListColumn("Reg", "Reg"); + TreelistView.TreeListColumn treeListColumn17 = new TreelistView.TreeListColumn("Type", "Type"); + TreelistView.TreeListColumn treeListColumn18 = new TreelistView.TreeListColumn("SysValue", "SysValue"); + TreelistView.TreeListColumn treeListColumn19 = new TreelistView.TreeListColumn("Mask", "Mask"); + TreelistView.TreeListColumn treeListColumn20 = new TreelistView.TreeListColumn("Unused", "Unused"); this.variableBox = new System.Windows.Forms.GroupBox(); this.variableRegs = new TreelistView.TreeListView(); this.constantBox = new System.Windows.Forms.GroupBox(); @@ -107,6 +107,9 @@ this.Value = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.variableHover = new System.Windows.Forms.ToolTip(this.components); this.hoverTimer = new System.Windows.Forms.Timer(this.components); + this.selectedSliceFaceGlobalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.selectedSampleGlobalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.variableBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.variableRegs)).BeginInit(); this.constantBox.SuspendLayout(); @@ -136,17 +139,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); @@ -172,17 +175,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); @@ -206,52 +209,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 @@ -421,7 +424,7 @@ this.editStrip.Location = new System.Drawing.Point(215, 0); this.editStrip.Margin = new System.Windows.Forms.Padding(0, 0, 12, 0); this.editStrip.Name = "editStrip"; - this.editStrip.Size = new System.Drawing.Size(55, 25); + this.editStrip.Size = new System.Drawing.Size(86, 25); this.editStrip.TabIndex = 2; this.editStrip.Text = "editStrip"; // @@ -441,7 +444,10 @@ this.snippetDropDown.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.textureDimensionsToolStripMenuItem, this.selectedMipGlobalToolStripMenuItem, + this.selectedSliceFaceGlobalToolStripMenuItem, + this.selectedSampleGlobalToolStripMenuItem, this.textureTypeGlobalToolStripMenuItem, + this.toolStripSeparator1, this.pointLinearSamplersToolStripMenuItem, this.textureResourcesToolStripMenuItem}); this.snippetDropDown.Image = global::renderdocui.Properties.Resources.plugin_add; @@ -453,35 +459,35 @@ // textureDimensionsToolStripMenuItem // this.textureDimensionsToolStripMenuItem.Name = "textureDimensionsToolStripMenuItem"; - this.textureDimensionsToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.textureDimensionsToolStripMenuItem.Size = new System.Drawing.Size(282, 22); this.textureDimensionsToolStripMenuItem.Text = "Texture Dimensions Global"; this.textureDimensionsToolStripMenuItem.Click += new System.EventHandler(this.textureDimensionsToolStripMenuItem_Click); // // selectedMipGlobalToolStripMenuItem // this.selectedMipGlobalToolStripMenuItem.Name = "selectedMipGlobalToolStripMenuItem"; - this.selectedMipGlobalToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.selectedMipGlobalToolStripMenuItem.Size = new System.Drawing.Size(282, 22); this.selectedMipGlobalToolStripMenuItem.Text = "Selected Mip Global"; this.selectedMipGlobalToolStripMenuItem.Click += new System.EventHandler(this.selectedMipGlobalToolStripMenuItem_Click); // // textureTypeGlobalToolStripMenuItem // this.textureTypeGlobalToolStripMenuItem.Name = "textureTypeGlobalToolStripMenuItem"; - this.textureTypeGlobalToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.textureTypeGlobalToolStripMenuItem.Size = new System.Drawing.Size(282, 22); this.textureTypeGlobalToolStripMenuItem.Text = "Texture Type Global"; this.textureTypeGlobalToolStripMenuItem.Click += new System.EventHandler(this.textureTypeGlobalToolStripMenuItem_Click); // // pointLinearSamplersToolStripMenuItem // this.pointLinearSamplersToolStripMenuItem.Name = "pointLinearSamplersToolStripMenuItem"; - this.pointLinearSamplersToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.pointLinearSamplersToolStripMenuItem.Size = new System.Drawing.Size(282, 22); this.pointLinearSamplersToolStripMenuItem.Text = "Point && Linear Samplers"; this.pointLinearSamplersToolStripMenuItem.Click += new System.EventHandler(this.pointLinearSamplersToolStripMenuItem_Click); // // textureResourcesToolStripMenuItem // this.textureResourcesToolStripMenuItem.Name = "textureResourcesToolStripMenuItem"; - this.textureResourcesToolStripMenuItem.Size = new System.Drawing.Size(200, 22); + this.textureResourcesToolStripMenuItem.Size = new System.Drawing.Size(282, 22); this.textureResourcesToolStripMenuItem.Text = "Texture Resources"; this.textureResourcesToolStripMenuItem.Click += new System.EventHandler(this.textureResourcesToolStripMenuItem_Click); // @@ -489,7 +495,7 @@ // this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.findinall}); - this.toolStrip1.Location = new System.Drawing.Point(282, 0); + this.toolStrip1.Location = new System.Drawing.Point(313, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(33, 25); this.toolStrip1.TabIndex = 3; @@ -540,29 +546,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); @@ -587,30 +593,30 @@ // // 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}); - this.outSig.Cursor = System.Windows.Forms.Cursors.VSplit; + 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); this.outSig.MultiSelect = false; @@ -688,6 +694,25 @@ this.hoverTimer.Interval = 500; this.hoverTimer.Tick += new System.EventHandler(this.hoverTimer_Tick); // + // selectedSliceFaceGlobalToolStripMenuItem + // + this.selectedSliceFaceGlobalToolStripMenuItem.Name = "selectedSliceFaceGlobalToolStripMenuItem"; + this.selectedSliceFaceGlobalToolStripMenuItem.Size = new System.Drawing.Size(282, 22); + this.selectedSliceFaceGlobalToolStripMenuItem.Text = "Selected Array Slice / Cubemap Face Global"; + this.selectedSliceFaceGlobalToolStripMenuItem.Click += new System.EventHandler(this.selectedSliceFaceGlobalToolStripMenuItem_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(279, 6); + // + // selectedSampleGlobalToolStripMenuItem + // + this.selectedSampleGlobalToolStripMenuItem.Name = "selectedSampleGlobalToolStripMenuItem"; + this.selectedSampleGlobalToolStripMenuItem.Size = new System.Drawing.Size(282, 22); + this.selectedSampleGlobalToolStripMenuItem.Text = "Selected Sample Global"; + this.selectedSampleGlobalToolStripMenuItem.Click += new System.EventHandler(this.selectedSampleGlobalToolStripMenuItem_Click); + // // ShaderViewer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -774,5 +799,8 @@ private System.Windows.Forms.Timer hoverTimer; private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripButton findinall; + private System.Windows.Forms.ToolStripMenuItem selectedSliceFaceGlobalToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectedSampleGlobalToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; } } diff --git a/renderdocui/Windows/ShaderViewer.cs b/renderdocui/Windows/ShaderViewer.cs index acbe63a46..c541892e1 100644 --- a/renderdocui/Windows/ShaderViewer.cs +++ b/renderdocui/Windows/ShaderViewer.cs @@ -2073,6 +2073,8 @@ namespace renderdocui.Windows " uvec4 TexDim;{0}" + " uint SelectedMip;{0}" + " int TextureType;{0}" + + " uint SelectedSliceFace;{0}" + + " int SelectedSample;{0}" + "}} RENDERDOC;{0}{0}", Environment.NewLine)); } @@ -2105,6 +2107,34 @@ namespace renderdocui.Windows CurrentScintilla.CurrentPos = 0; } + private void selectedSliceFaceGlobalToolStripMenuItem_Click(object sender, EventArgs e) + { + if (CurrentScintilla == null) + return; + + if (m_Core.APIProps.pipelineType == APIPipelineStateType.Vulkan) + InsertVulkanUBO(); + else if (m_Core.APIProps.pipelineType == APIPipelineStateType.D3D11) + CurrentScintilla.InsertText(GetPostVersionInsertPosition(), "uint RENDERDOC_SelectedSliceFace; // selected array slice or cubemap face in UI" + Environment.NewLine + Environment.NewLine); + else if (m_Core.APIProps.pipelineType == APIPipelineStateType.OpenGL) + CurrentScintilla.InsertText(GetPostVersionInsertPosition(), "uniform uint RENDERDOC_SelectedSliceFace; // selected array slice or cubemap face in UI" + Environment.NewLine + Environment.NewLine); + CurrentScintilla.CurrentPos = 0; + } + + private void selectedSampleGlobalToolStripMenuItem_Click(object sender, EventArgs e) + { + if (CurrentScintilla == null) + return; + + if (m_Core.APIProps.pipelineType == APIPipelineStateType.Vulkan) + InsertVulkanUBO(); + else if (m_Core.APIProps.pipelineType == APIPipelineStateType.D3D11) + CurrentScintilla.InsertText(GetPostVersionInsertPosition(), "int RENDERDOC_SelectedSample; // selected MSAA sample or -numSamples for resolve. See docs" + Environment.NewLine + Environment.NewLine); + else if (m_Core.APIProps.pipelineType == APIPipelineStateType.OpenGL) + CurrentScintilla.InsertText(GetPostVersionInsertPosition(), "uniform int RENDERDOC_SelectedSample; // selected MSAA sample or -numSamples for resolve. See docs" + Environment.NewLine + Environment.NewLine); + CurrentScintilla.CurrentPos = 0; + } + private void textureTypeGlobalToolStripMenuItem_Click(object sender, EventArgs e) { if (CurrentScintilla == null) diff --git a/renderdocui/Windows/ShaderViewer.resx b/renderdocui/Windows/ShaderViewer.resx index 5a7cf002f..5f9696a66 100644 --- a/renderdocui/Windows/ShaderViewer.resx +++ b/renderdocui/Windows/ShaderViewer.resx @@ -157,12 +157,6 @@ 582, 17 - - 261, 17 - - - 582, 17 - 354, 17 diff --git a/renderdocui/Windows/TextureViewer.cs b/renderdocui/Windows/TextureViewer.cs index beaf7277a..575e21e1b 100644 --- a/renderdocui/Windows/TextureViewer.cs +++ b/renderdocui/Windows/TextureViewer.cs @@ -904,8 +904,9 @@ namespace renderdocui.Windows m_Core.APIProps.pipelineType == APIPipelineStateType.Vulkan) { src = String.Format( - "#version 420 core{0}" + - "layout (location = 0) out vec4 color_out;{0}" + + "#version 420 core{0}{0}" + + "layout (location = 0) in vec2 uv;{0}{0}" + + "layout (location = 0) out vec4 color_out;{0}{0}" + "void main(){0}" + "{{{0}" + " color_out = vec4(0,0,0,1);{0}" +