ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

emuhawk - add experimental prescale option to display manager

This commit is contained in:
zeromus 2015-07-06 12:31:30 -05:00
parent 60c3734e8c
commit db1191dc48
6 changed files with 186 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/config/Config.cs
View File

@ -215,6 +215,8 @@ namespace BizHawk.Client.Common
public bool DispFixScaleInteger = true;
public bool DispFullscreenHacks = true;
public int DispPrescale = 1;
//warning: we dont even want to deal with changing this at runtime. but we want it changed here for config purposes. so dont check this variable. check in GlobalWin or something like that.
public EDispMethod DispMethod = EDispMethod.OpenGL;

6
BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
View File

@ -200,6 +200,12 @@ namespace BizHawk.Client.EmuHawk
//add lua layer 'emu'
AppendLuaLayer(chain, "emu");
if (Global.Config.DispPrescale != 1)
{
Filters.PrescaleFilter fPrescale = new Filters.PrescaleFilter() { Scale = Global.Config.DispPrescale };
chain.AddFilter(fPrescale, "prescale");
}
//add user-selected retro shader
if (selectedChain != null)
AppendRetroShaderChain(chain, "retroShader", selectedChain, selectedChainProperties);

3
BizHawk.Client.EmuHawk/DisplayManager/Filters/BaseFilter.cs
View File

@ -35,7 +35,7 @@ namespace BizHawk.Client.EmuHawk.Filters
public virtual void Initialize() { }
public virtual Size PresizeInput(string channel, Size size) { return size; }
public virtual Size PresizeOutput(string channel, Size size) { return size; }
public virtual void SetInputFormat(string channel, SurfaceState state) { }
public virtual void SetInputFormat(string channel, SurfaceState state) { } //TODO - why a different param order than DeclareOutput?
public Dictionary<string, object> Parameters = new Dictionary<string, object>();
//runtime signals
@ -85,6 +85,7 @@ namespace BizHawk.Client.EmuHawk.Filters
//setup utilities
protected IOSurfaceInfo DeclareInput(SurfaceDisposition disposition = SurfaceDisposition.Unspecified, string channel = "default") { return DeclareIO(SurfaceDirection.Input, channel, disposition); }
protected IOSurfaceInfo DeclareOutput(SurfaceDisposition disposition = SurfaceDisposition.Unspecified, string channel = "default") { return DeclareIO(SurfaceDirection.Output, channel, disposition); }
//TODO - why a different param order than DeclareOutput?
protected IOSurfaceInfo DeclareOutput(SurfaceState state, string channel = "default")
{

30
BizHawk.Client.EmuHawk/DisplayManager/Filters/Gui.cs
View File

@ -310,6 +310,36 @@ namespace BizHawk.Client.EmuHawk.Filters
}
}
//TODO - turn this into a NOP at 1x, just in case something accidentally activates it with 1x
public class PrescaleFilter : BaseFilter
{
public int Scale;
public override void Initialize()
{
DeclareInput(SurfaceDisposition.Texture);
}
public override void SetInputFormat(string channel, SurfaceState state)
{
var OutputSize = state.SurfaceFormat.Size;
OutputSize.Width *= Scale;
OutputSize.Height *= Scale;
var ss = new SurfaceState(new SurfaceFormat(OutputSize), SurfaceDisposition.RenderTarget);
DeclareOutput(ss, channel);
}
public override void Run()
{
var outSize = FindOutput().SurfaceFormat.Size;
FilterProgram.GuiRenderer.Begin(outSize);
FilterProgram.GuiRenderer.SetBlendState(FilterProgram.GL.BlendNoneCopy);
FilterProgram.GuiRenderer.Modelview.Scale(Scale);
FilterProgram.GuiRenderer.Draw(InputTexture);
FilterProgram.GuiRenderer.End();
}
}
public class LuaLayer : BaseFilter
{
public override void Initialize()

238
BizHawk.Client.EmuHawk/config/DisplayConfigLite.Designer.cs generated
View File

@ -69,18 +69,21 @@
this.rbGDIPlus = new System.Windows.Forms.RadioButton();
this.tpMisc = new System.Windows.Forms.TabPage();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.trackbarFrameSizeWindowed = new BizHawk.Client.EmuHawk.TransparentTrackBar();
this.label9 = new System.Windows.Forms.Label();
this.cbStatusBarWindowed = new System.Windows.Forms.CheckBox();
this.cbCaptionWindowed = new System.Windows.Forms.CheckBox();
this.cbMenuWindowed = new System.Windows.Forms.CheckBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblFrameTypeWindowed = new System.Windows.Forms.Label();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.cbStatusBarFullscreen = new System.Windows.Forms.CheckBox();
this.cbMenuFullscreen = new System.Windows.Forms.CheckBox();
this.label1 = new System.Windows.Forms.Label();
this.checkFullscreenHacks = new System.Windows.Forms.CheckBox();
this.cbStatusBarFullscreen = new System.Windows.Forms.CheckBox();
this.cbMenuFullscreen = new System.Windows.Forms.CheckBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblFrameTypeWindowed = new System.Windows.Forms.Label();
this.cbStatusBarWindowed = new System.Windows.Forms.CheckBox();
this.label9 = new System.Windows.Forms.Label();
this.cbMenuWindowed = new System.Windows.Forms.CheckBox();
this.trackbarFrameSizeWindowed = new BizHawk.Client.EmuHawk.TransparentTrackBar();
this.cbCaptionWindowed = new System.Windows.Forms.CheckBox();
this.nudPrescale = new System.Windows.Forms.NumericUpDown();
this.label10 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tbScanlineIntensity)).BeginInit();
this.grpFinalFilter.SuspendLayout();
@ -91,9 +94,10 @@
this.groupBox3.SuspendLayout();
this.tpMisc.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.trackbarFrameSizeWindowed)).BeginInit();
this.groupBox2.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.trackbarFrameSizeWindowed)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudPrescale)).BeginInit();
this.SuspendLayout();
//
// btnCancel
@ -249,7 +253,7 @@
this.grpFinalFilter.Controls.Add(this.rbFinalFilterBilinear);
this.grpFinalFilter.Location = new System.Drawing.Point(205, 6);
this.grpFinalFilter.Name = "grpFinalFilter";
this.grpFinalFilter.Size = new System.Drawing.Size(187, 132);
this.grpFinalFilter.Size = new System.Drawing.Size(187, 97);
this.grpFinalFilter.TabIndex = 8;
this.grpFinalFilter.TabStop = false;
this.grpFinalFilter.Text = "Final Filter";
@ -427,6 +431,9 @@
//
// tpAR
//
this.tpAR.Controls.Add(this.label11);
this.tpAR.Controls.Add(this.label10);
this.tpAR.Controls.Add(this.nudPrescale);
this.tpAR.Controls.Add(this.groupBox1);
this.tpAR.Controls.Add(this.checkLetterbox);
this.tpAR.Controls.Add(this.checkPadInteger);
@ -538,55 +545,56 @@
this.tabPage1.Text = "Window";
this.tabPage1.UseVisualStyleBackColor = true;
//
// trackbarFrameSizeWindowed
// groupBox4
//
this.trackbarFrameSizeWindowed.LargeChange = 1;
this.trackbarFrameSizeWindowed.Location = new System.Drawing.Point(6, 33);
this.trackbarFrameSizeWindowed.Maximum = 2;
this.trackbarFrameSizeWindowed.Name = "trackbarFrameSizeWindowed";
this.trackbarFrameSizeWindowed.Size = new System.Drawing.Size(99, 42);
this.trackbarFrameSizeWindowed.TabIndex = 21;
this.trackbarFrameSizeWindowed.Value = 1;
this.trackbarFrameSizeWindowed.ValueChanged += new System.EventHandler(this.trackbarFrameSizeWindowed_ValueChanged);
this.groupBox4.Controls.Add(this.label1);
this.groupBox4.Controls.Add(this.checkFullscreenHacks);
this.groupBox4.Controls.Add(this.cbStatusBarFullscreen);
this.groupBox4.Controls.Add(this.cbMenuFullscreen);
this.groupBox4.Location = new System.Drawing.Point(143, 6);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(266, 212);
this.groupBox4.TabIndex = 27;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Fullscreen";
//
// label9
// label1
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(6, 17);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(39, 13);
this.label9.TabIndex = 22;
this.label9.Text = "Frame:";
this.label1.Location = new System.Drawing.Point(7, 88);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(240, 115);
this.label1.TabIndex = 27;
this.label1.Text = resources.GetString("label1.Text");
//
// cbStatusBarWindowed
// checkFullscreenHacks
//
this.cbStatusBarWindowed.AutoSize = true;
this.cbStatusBarWindowed.Location = new System.Drawing.Point(9, 81);
this.cbStatusBarWindowed.Name = "cbStatusBarWindowed";
this.cbStatusBarWindowed.Size = new System.Drawing.Size(75, 17);
this.cbStatusBarWindowed.TabIndex = 23;
this.cbStatusBarWindowed.Text = "Status Bar";
this.cbStatusBarWindowed.UseVisualStyleBackColor = true;
this.checkFullscreenHacks.AutoSize = true;
this.checkFullscreenHacks.Location = new System.Drawing.Point(6, 65);
this.checkFullscreenHacks.Name = "checkFullscreenHacks";
this.checkFullscreenHacks.Size = new System.Drawing.Size(191, 17);
this.checkFullscreenHacks.TabIndex = 26;
this.checkFullscreenHacks.Text = "Enable Windows Fullscreen Hacks";
this.checkFullscreenHacks.UseVisualStyleBackColor = true;
//
// cbCaptionWindowed
// cbStatusBarFullscreen
//
this.cbCaptionWindowed.AutoSize = true;
this.cbCaptionWindowed.Location = new System.Drawing.Point(9, 104);
this.cbCaptionWindowed.Name = "cbCaptionWindowed";
this.cbCaptionWindowed.Size = new System.Drawing.Size(62, 17);
this.cbCaptionWindowed.TabIndex = 24;
this.cbCaptionWindowed.Text = "Caption";
this.cbCaptionWindowed.UseVisualStyleBackColor = true;
this.cbStatusBarFullscreen.AutoSize = true;
this.cbStatusBarFullscreen.Location = new System.Drawing.Point(6, 19);
this.cbStatusBarFullscreen.Name = "cbStatusBarFullscreen";
this.cbStatusBarFullscreen.Size = new System.Drawing.Size(75, 17);
this.cbStatusBarFullscreen.TabIndex = 23;
this.cbStatusBarFullscreen.Text = "Status Bar";
this.cbStatusBarFullscreen.UseVisualStyleBackColor = true;
//
// cbMenuWindowed
// cbMenuFullscreen
//
this.cbMenuWindowed.AutoSize = true;
this.cbMenuWindowed.Location = new System.Drawing.Point(9, 127);
this.cbMenuWindowed.Name = "cbMenuWindowed";
this.cbMenuWindowed.Size = new System.Drawing.Size(53, 17);
this.cbMenuWindowed.TabIndex = 25;
this.cbMenuWindowed.Text = "Menu";
this.cbMenuWindowed.UseVisualStyleBackColor = true;
this.cbMenuFullscreen.AutoSize = true;
this.cbMenuFullscreen.Location = new System.Drawing.Point(6, 42);
this.cbMenuFullscreen.Name = "cbMenuFullscreen";
this.cbMenuFullscreen.Size = new System.Drawing.Size(53, 17);
this.cbMenuFullscreen.TabIndex = 25;
this.cbMenuFullscreen.Text = "Menu";
this.cbMenuFullscreen.UseVisualStyleBackColor = true;
//
// groupBox2
//
@ -612,56 +620,90 @@
this.lblFrameTypeWindowed.TabIndex = 26;
this.lblFrameTypeWindowed.Text = "(frame type)";
//
// groupBox4
// cbStatusBarWindowed
//
this.groupBox4.Controls.Add(this.label1);
this.groupBox4.Controls.Add(this.checkFullscreenHacks);
this.groupBox4.Controls.Add(this.cbStatusBarFullscreen);
this.groupBox4.Controls.Add(this.cbMenuFullscreen);
this.groupBox4.Location = new System.Drawing.Point(143, 6);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(266, 212);
this.groupBox4.TabIndex = 27;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Fullscreen";
this.cbStatusBarWindowed.AutoSize = true;
this.cbStatusBarWindowed.Location = new System.Drawing.Point(9, 81);
this.cbStatusBarWindowed.Name = "cbStatusBarWindowed";
this.cbStatusBarWindowed.Size = new System.Drawing.Size(75, 17);
this.cbStatusBarWindowed.TabIndex = 23;
this.cbStatusBarWindowed.Text = "Status Bar";
this.cbStatusBarWindowed.UseVisualStyleBackColor = true;
//
// cbStatusBarFullscreen
// label9
//
this.cbStatusBarFullscreen.AutoSize = true;
this.cbStatusBarFullscreen.Location = new System.Drawing.Point(6, 19);
this.cbStatusBarFullscreen.Name = "cbStatusBarFullscreen";
this.cbStatusBarFullscreen.Size = new System.Drawing.Size(75, 17);
this.cbStatusBarFullscreen.TabIndex = 23;
this.cbStatusBarFullscreen.Text = "Status Bar";
this.cbStatusBarFullscreen.UseVisualStyleBackColor = true;
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(6, 17);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(39, 13);
this.label9.TabIndex = 22;
this.label9.Text = "Frame:";
//
// cbMenuFullscreen
// cbMenuWindowed
//
this.cbMenuFullscreen.AutoSize = true;
this.cbMenuFullscreen.Location = new System.Drawing.Point(6, 42);
this.cbMenuFullscreen.Name = "cbMenuFullscreen";
this.cbMenuFullscreen.Size = new System.Drawing.Size(53, 17);
this.cbMenuFullscreen.TabIndex = 25;
this.cbMenuFullscreen.Text = "Menu";
this.cbMenuFullscreen.UseVisualStyleBackColor = true;
this.cbMenuWindowed.AutoSize = true;
this.cbMenuWindowed.Location = new System.Drawing.Point(9, 127);
this.cbMenuWindowed.Name = "cbMenuWindowed";
this.cbMenuWindowed.Size = new System.Drawing.Size(53, 17);
this.cbMenuWindowed.TabIndex = 25;
this.cbMenuWindowed.Text = "Menu";
this.cbMenuWindowed.UseVisualStyleBackColor = true;
//
// label1
// trackbarFrameSizeWindowed
//
this.label1.Location = new System.Drawing.Point(7, 88);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(240, 115);
this.label1.TabIndex = 27;
this.label1.Text = resources.GetString("label1.Text");
this.trackbarFrameSizeWindowed.LargeChange = 1;
this.trackbarFrameSizeWindowed.Location = new System.Drawing.Point(6, 33);
this.trackbarFrameSizeWindowed.Maximum = 2;
this.trackbarFrameSizeWindowed.Name = "trackbarFrameSizeWindowed";
this.trackbarFrameSizeWindowed.Size = new System.Drawing.Size(99, 42);
this.trackbarFrameSizeWindowed.TabIndex = 21;
this.trackbarFrameSizeWindowed.Value = 1;
this.trackbarFrameSizeWindowed.ValueChanged += new System.EventHandler(this.trackbarFrameSizeWindowed_ValueChanged);
//
// checkFullscreenHacks
// cbCaptionWindowed
//
this.checkFullscreenHacks.AutoSize = true;
this.checkFullscreenHacks.Location = new System.Drawing.Point(6, 65);
this.checkFullscreenHacks.Name = "checkFullscreenHacks";
this.checkFullscreenHacks.Size = new System.Drawing.Size(191, 17);
this.checkFullscreenHacks.TabIndex = 26;
this.checkFullscreenHacks.Text = "Enable Windows Fullscreen Hacks";
this.checkFullscreenHacks.UseVisualStyleBackColor = true;
this.cbCaptionWindowed.AutoSize = true;
this.cbCaptionWindowed.Location = new System.Drawing.Point(9, 104);
this.cbCaptionWindowed.Name = "cbCaptionWindowed";
this.cbCaptionWindowed.Size = new System.Drawing.Size(62, 17);
this.cbCaptionWindowed.TabIndex = 24;
this.cbCaptionWindowed.Text = "Caption";
this.cbCaptionWindowed.UseVisualStyleBackColor = true;
//
// nudPrescale
//
this.nudPrescale.Location = new System.Drawing.Point(260, 113);
this.nudPrescale.Minimum = new decimal(new int[] {
1,
0,
0,
0});
this.nudPrescale.Name = "nudPrescale";
this.nudPrescale.Size = new System.Drawing.Size(45, 20);
this.nudPrescale.TabIndex = 14;
this.nudPrescale.Value = new decimal(new int[] {
1,
0,
0,
0});
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(208, 116);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(51, 13);
this.label10.TabIndex = 15;
this.label10.Text = "Prescale:";
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(307, 117);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(14, 13);
this.label11.TabIndex = 16;
this.label11.Text = "X";
//
// DisplayConfigLite
//
@ -693,11 +735,12 @@
this.tpMisc.ResumeLayout(false);
this.tpMisc.PerformLayout();
this.tabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.trackbarFrameSizeWindowed)).EndInit();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.trackbarFrameSizeWindowed)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudPrescale)).EndInit();
this.ResumeLayout(false);
}
@ -756,5 +799,8 @@
private System.Windows.Forms.Label lblFrameTypeWindowed;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.CheckBox checkFullscreenHacks;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.NumericUpDown nudPrescale;
}
}

4
BizHawk.Client.EmuHawk/config/DisplayConfigLite.cs
View File

@ -48,6 +48,8 @@ namespace BizHawk.Client.EmuHawk.config
trackbarFrameSizeWindowed.Value = Global.Config.DispChrome_FrameWindowed;
SyncTrackbar();
nudPrescale.Value = Global.Config.DispPrescale;
// null emulator config hack
{
NullEmulator.NullEmulatorSettings s;
@ -89,6 +91,8 @@ namespace BizHawk.Client.EmuHawk.config
if (rbFinalFilterBicubic.Checked)
Global.Config.DispFinalFilter = 2;
Global.Config.DispPrescale = (int)nudPrescale.Value;
Global.Config.TargetScanlineFilterIntensity = tbScanlineIntensity.Value;
Global.Config.DispFixAspectRatio = checkLetterbox.Checked;
Global.Config.DispFixScaleInteger = checkPadInteger.Checked;