From c2666b52bc01e2034b4bd8d2577772c1f93bfb09 Mon Sep 17 00:00:00 2001 From: lightningterror <18107717+lightningterror@users.noreply.github.com> Date: Fri, 10 Jun 2022 15:00:37 +0200 Subject: [PATCH] Revert "gsdumpgui: Update renderer options." This reverts commit 0c752d2ae11628cc15d09df11ab1483ecdd2a81f. --- Forms/frmMain.Designer.cs | 51 +++++++++++++++++++++++++++++++++++--- Forms/frmMain.cs | 13 ++++++++-- Forms/frmMain.resx | 6 ++--- Properties/AssemblyInfo.cs | 4 +-- 4 files changed, 64 insertions(+), 10 deletions(-) diff --git a/Forms/frmMain.Designer.cs b/Forms/frmMain.Designer.cs index 47ea419..d7f4fc0 100644 --- a/Forms/frmMain.Designer.cs +++ b/Forms/frmMain.Designer.cs @@ -48,8 +48,11 @@ this.lblLog = new System.Windows.Forms.Label(); this.cmdOpenIni = new System.Windows.Forms.Button(); this.pctBox = new System.Windows.Forms.PictureBox(); + this.rdaDX9HW = new System.Windows.Forms.RadioButton(); this.rdaDX1011HW = new System.Windows.Forms.RadioButton(); this.rdaOGLHW = new System.Windows.Forms.RadioButton(); + this.rdaDX9SW = new System.Windows.Forms.RadioButton(); + this.rdaDX1011SW = new System.Windows.Forms.RadioButton(); this.rdaOGLSW = new System.Windows.Forms.RadioButton(); this.lblOverride = new System.Windows.Forms.Label(); this.rdaNone = new System.Windows.Forms.RadioButton(); @@ -248,10 +251,22 @@ this.pctBox.TabStop = false; this.pctBox.Click += new System.EventHandler(PreviewImageClick); // + // rdaDX9HW + // + this.rdaDX9HW.AutoSize = true; + this.rdaDX9HW.Location = new System.Drawing.Point(874, 111); + this.rdaDX9HW.Name = "rdaDX9HW"; + this.rdaDX9HW.Size = new System.Drawing.Size(75, 17); + this.rdaDX9HW.TabIndex = 17; + this.rdaDX9HW.Tag = "1"; + this.rdaDX9HW.Text = "D3D9 HW"; + this.rdaDX9HW.UseVisualStyleBackColor = true; + this.rdaDX9HW.CheckedChanged += new System.EventHandler(this.rda_CheckedChanged); + // // rdaDX1011HW // this.rdaDX1011HW.AutoSize = true; - this.rdaDX1011HW.Location = new System.Drawing.Point(874, 115); + this.rdaDX1011HW.Location = new System.Drawing.Point(874, 129); this.rdaDX1011HW.Name = "rdaDX1011HW"; this.rdaDX1011HW.Size = new System.Drawing.Size(81, 17); this.rdaDX1011HW.TabIndex = 18; @@ -263,7 +278,7 @@ // rdaOGLHW // this.rdaOGLHW.AutoSize = true; - this.rdaOGLHW.Location = new System.Drawing.Point(874, 138); + this.rdaOGLHW.Location = new System.Drawing.Point(874, 147); this.rdaOGLHW.Name = "rdaOGLHW"; this.rdaOGLHW.Size = new System.Drawing.Size(69, 17); this.rdaOGLHW.TabIndex = 19; @@ -272,10 +287,34 @@ this.rdaOGLHW.UseVisualStyleBackColor = true; this.rdaOGLHW.CheckedChanged += new System.EventHandler(this.rda_CheckedChanged); // + // rdaDX9SW + // + this.rdaDX9SW.AutoSize = true; + this.rdaDX9SW.Location = new System.Drawing.Point(971, 111); + this.rdaDX9SW.Name = "rdaDX9SW"; + this.rdaDX9SW.Size = new System.Drawing.Size(74, 17); + this.rdaDX9SW.TabIndex = 20; + this.rdaDX9SW.Tag = "4"; + this.rdaDX9SW.Text = "D3D9 SW"; + this.rdaDX9SW.UseVisualStyleBackColor = true; + this.rdaDX9SW.CheckedChanged += new System.EventHandler(this.rda_CheckedChanged); + // + // rdaDX1011SW + // + this.rdaDX1011SW.AutoSize = true; + this.rdaDX1011SW.Location = new System.Drawing.Point(971, 129); + this.rdaDX1011SW.Name = "rdaDX1011SW"; + this.rdaDX1011SW.Size = new System.Drawing.Size(80, 17); + this.rdaDX1011SW.TabIndex = 21; + this.rdaDX1011SW.Tag = "5"; + this.rdaDX1011SW.Text = "D3D11 SW"; + this.rdaDX1011SW.UseVisualStyleBackColor = true; + this.rdaDX1011SW.CheckedChanged += new System.EventHandler(this.rda_CheckedChanged); + // // rdaOGLSW // this.rdaOGLSW.AutoSize = true; - this.rdaOGLSW.Location = new System.Drawing.Point(971, 138); + this.rdaOGLSW.Location = new System.Drawing.Point(971, 147); this.rdaOGLSW.Name = "rdaOGLSW"; this.rdaOGLSW.Size = new System.Drawing.Size(68, 17); this.rdaOGLSW.TabIndex = 22; @@ -663,8 +702,11 @@ this.Controls.Add(this.rdaNone); this.Controls.Add(this.lblOverride); this.Controls.Add(this.rdaOGLSW); + this.Controls.Add(this.rdaDX1011SW); + this.Controls.Add(this.rdaDX9SW); this.Controls.Add(this.rdaOGLHW); this.Controls.Add(this.rdaDX1011HW); + this.Controls.Add(this.rdaDX9HW); this.Controls.Add(this.lstGSDX); this.Controls.Add(this.pctBox); this.Controls.Add(this.cmdOpenIni); @@ -714,8 +756,11 @@ private System.Windows.Forms.Label lblLog; private System.Windows.Forms.Button cmdOpenIni; private System.Windows.Forms.PictureBox pctBox; + private System.Windows.Forms.RadioButton rdaDX9HW; private System.Windows.Forms.RadioButton rdaDX1011HW; private System.Windows.Forms.RadioButton rdaOGLHW; + private System.Windows.Forms.RadioButton rdaDX9SW; + private System.Windows.Forms.RadioButton rdaDX1011SW; private System.Windows.Forms.RadioButton rdaOGLSW; private System.Windows.Forms.Label lblOverride; private System.Windows.Forms.RadioButton rdaNone; diff --git a/Forms/frmMain.cs b/Forms/frmMain.cs index cdb7cde..1bad6a8 100644 --- a/Forms/frmMain.cs +++ b/Forms/frmMain.cs @@ -64,12 +64,21 @@ namespace GSDumpGUI rdaNone.Checked = true; break; case 1: - rdaDX1011HW.Checked = true; + rdaDX9HW.Checked = true; break; case 2: - rdaOGLHW.Checked = true; + rdaDX1011HW.Checked = true; break; case 3: + rdaOGLHW.Checked = true; + break; + case 4: + rdaDX9SW.Checked = true; + break; + case 5: + rdaDX1011SW.Checked = true; + break; + case 6: rdaOGLSW.Checked = true; break; } diff --git a/Forms/frmMain.resx b/Forms/frmMain.resx index 2093762..2501a73 100644 --- a/Forms/frmMain.resx +++ b/Forms/frmMain.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + AAABAAcAEBAAAAAAIABoBAAAdgAAABgYAAAAACAAiAkAAN4EAAAgIAAAAAAgAKgQAABmDgAAMDAAAAAA diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 37a36b8..a5a7157 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -55,5 +55,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.1")] -[assembly: AssemblyFileVersion("1.0.0.1")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")]