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

fix raw screenshots, which previously were a mixed up mess of user filters and sysdrawing downscaling. fixes #1902. 

This was broken by 95bc69b448 (or else it was benign at that time and broken later, but the fundamental change was here).

This caused the raw screenshots to go through the displaymanager instead of very simply converting the core's videoprovider at that point. The reason was because only the displaymanager had the power to render an opengl core's texture ID.

In this commit, I fixed it so that displaymanager had the power to render a videoprovider WITHOUT the user's scaling filters
This commit is contained in:
zeromus 2020-03-28 03:46:31 -04:00
parent 98265cd066
commit 90246dd4c1
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,7 +222,7 @@ namespace BizHawk.Client.EmuHawk
return padding;
}
FilterProgram BuildDefaultChain(Size chainInSize, Size chainOutSize, bool includeOSD)
FilterProgram BuildDefaultChain(Size chainInSize, Size chainOutSize, bool includeOSD, bool includeUserFilters)
{
// select user special FX shader chain
var selectedChainProperties = new Dictionary<string, object>();
@ -232,6 +232,8 @@ namespace BizHawk.Client.EmuHawk
selectedChain = ShaderChain_hq2x;
}
//ZOOM
if (Global.Config.TargetDisplayFilter == 2 && ShaderChain_scanlines != null && ShaderChain_scanlines.Available)
{
selectedChain = ShaderChain_scanlines;
@ -243,6 +245,9 @@ namespace BizHawk.Client.EmuHawk
selectedChain = ShaderChain_user;
}
if (!includeUserFilters)
selectedChain = null;
var fPresent = new Filters.FinalPresentation(chainOutSize);
var fInput = new Filters.SourceImage(chainInSize);
var fOSD = new Filters.OSD();
@ -437,7 +442,8 @@ namespace BizHawk.Client.EmuHawk
VideoProvider = videoProvider,
Simulate = displayNothing,
ChainOutsize = GraphicsControl.Size,
IncludeOSD = true
IncludeOSD = true,
IncludeUserFilters = true
};
UpdateSourceInternal(job);
}
@ -456,7 +462,8 @@ namespace BizHawk.Client.EmuHawk
Simulate = false,
ChainOutsize = targetSize,
Offscreen = true,
IncludeOSD = false
IncludeOSD = false,
IncludeUserFilters = false
};
UpdateSourceInternal(job);
return job.OffscreenBb;
@ -473,7 +480,8 @@ namespace BizHawk.Client.EmuHawk
Simulate = false,
ChainOutsize = GraphicsControl.Size,
Offscreen = true,
IncludeOSD = includeOSD
IncludeOSD = includeOSD,
IncludeUserFilters = true,
};
UpdateSourceInternal(job);
return job.OffscreenBb;
@ -657,7 +665,8 @@ namespace BizHawk.Client.EmuHawk
{
VideoProvider = fvp,
Simulate = true,
ChainOutsize = chainOutsize
ChainOutsize = chainOutsize,
IncludeUserFilters = true
};
var filterProgram = UpdateSourceInternal(job);
@ -681,6 +690,7 @@ namespace BizHawk.Client.EmuHawk
public bool Offscreen;
public BitmapBuffer OffscreenBb;
public bool IncludeOSD;
public bool IncludeUserFilters;
}
private FilterProgram UpdateSourceInternal(JobInfo job)
@ -770,7 +780,7 @@ namespace BizHawk.Client.EmuHawk
//build the default filter chain and set it up with services filters will need
Size chainInsize = new Size(bufferWidth, bufferHeight);
var filterProgram = BuildDefaultChain(chainInsize, chainOutsize, job.IncludeOSD);
var filterProgram = BuildDefaultChain(chainInsize, chainOutsize, job.IncludeOSD, job.IncludeUserFilters);
filterProgram.GuiRenderer = Renderer;
filterProgram.GL = GL;