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

dont malfunction when compiling filter shaders on low-spec systems; just make the filters unavailable instead

This commit is contained in:
zeromus 2014-02-03 07:43:47 +00:00
parent 83dc819fbe
commit 33294f9c81
7 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ namespace BizHawk.Client.EmuHawk
//TargetScanlineFilterIntensity
//apply filter chain (currently, over-simplified)
Texture2d currentTexture = videoTexture;
if (Global.Config.TargetDisplayFilter == 1)
if (Global.Config.TargetDisplayFilter == 1 && RetroShader_Hq2x.Pipeline.Available)
{
var rt = Video2xFrugalizer.Get(videoTexture.IntWidth*2,videoTexture.IntHeight*2);
rt.Bind();
@ -129,7 +129,7 @@ namespace BizHawk.Client.EmuHawk
RetroShader_Hq2x.Run(videoTexture, videoTexture.Size, outSize, true);
currentTexture = rt.Texture2d;
}
if (Global.Config.TargetDisplayFilter == 2)
if (Global.Config.TargetDisplayFilter == 2 && RetroShader_BizScanlines.Pipeline.Available)
{
var rt = Video2xFrugalizer.Get(videoTexture.IntWidth*2,videoTexture.IntHeight*2);
rt.Bind();

67
Bizware/BizHawk.Bizware.BizwareGL.OpenTK/IGL_TK.cs
View File

@ -92,18 +92,14 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.OpenTK
public IntPtr GetEmptyHandle() { return new IntPtr(0); }
public IntPtr GetEmptyUniformHandle() { return new IntPtr(-1); }
public Shader CreateFragmentShader(string source)
public Shader CreateFragmentShader(string source, bool required)
{
int sid = GL.CreateShader(ShaderType.FragmentShader);
CompileShaderSimple(sid,source);
return new Shader(this,new IntPtr(sid));
return CreateShader(ShaderType.FragmentShader, source, required);
}
public Shader CreateVertexShader(string source)
public Shader CreateVertexShader(string source, bool required)
{
int sid = GL.CreateShader(ShaderType.VertexShader);
CompileShaderSimple(sid, source);
return new Shader(this, new IntPtr(sid));
return CreateShader(ShaderType.VertexShader, source, required);
}
public void FreeShader(IntPtr shader) { GL.DeleteShader(shader.ToInt32()); }
@ -150,8 +146,10 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.OpenTK
public IBlendState BlendNone { get { return _rsBlendNone; } }
public IBlendState BlendNormal { get { return _rsBlendNormal; } }
public Pipeline CreatePipeline(VertexLayout vertexLayout, Shader vertexShader, Shader fragmentShader)
public Pipeline CreatePipeline(VertexLayout vertexLayout, Shader vertexShader, Shader fragmentShader, bool required)
{
bool success = true;
ErrorCode errcode;
int pid = GL.CreateProgram();
GL.AttachShader(pid, vertexShader.Id.ToInt32());
@ -167,14 +165,18 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.OpenTK
errcode = GL.GetError();
string resultLog = GL.GetProgramInfoLog(pid);
if (errcode != ErrorCode.NoError)
throw new InvalidOperationException("Error creating pipeline (error returned from glLinkProgram): " + errcode + "\r\n\r\n" + resultLog);
if (required)
throw new InvalidOperationException("Error creating pipeline (error returned from glLinkProgram): " + errcode + "\r\n\r\n" + resultLog);
else success = false;
int linkStatus;
GL.GetProgram(pid, GetProgramParameterName.LinkStatus, out linkStatus);
if(linkStatus == 0)
throw new InvalidOperationException("Error creating pipeline (link status false returned from glLinkProgram): " + "\r\n\r\n" + resultLog);
if (linkStatus == 0)
if (required)
throw new InvalidOperationException("Error creating pipeline (link status false returned from glLinkProgram): " + "\r\n\r\n" + resultLog);
else success = false;
//need to work on validation. apparently there are some weird caveats to glValidate which make it complicated and possibly excuses (barely) the intel drivers' dysfunctional operation
//"A sampler points to a texture unit used by fixed function with an incompatible target"
@ -247,7 +249,10 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.OpenTK
//deactivate the program, so we dont accidentally use it
GL.UseProgram(0);
return new Pipeline(this, new IntPtr(pid), vertexLayout, uniforms);
if (!vertexShader.Available) success = false;
if (!fragmentShader.Available) success = false;
return new Pipeline(this, new IntPtr(pid), success, vertexLayout, uniforms);
}
public VertexLayout CreateVertexLayout() { return new VertexLayout(this, new IntPtr(0)); }
@ -269,6 +274,7 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.OpenTK
public void BindPipeline(Pipeline pipeline)
{
if (!pipeline.Available) throw new InvalidOperationException("Attempt to bind unavailable pipeline");
sStatePendingVertexLayout = pipeline.VertexLayout;
GL.UseProgram(pipeline.Id.ToInt32());
}
@ -488,15 +494,30 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.OpenTK
return glc;
}
void CompileShaderSimple(int sid, string source)
Shader CreateShader(ShaderType type, string source, bool required)
{
int sid = GL.CreateShader(type);
bool ok = CompileShaderSimple(sid,source, required);
if(!ok)
{
GL.DeleteShader(sid);
sid = 0;
}
return new Shader(this, new IntPtr(sid), ok);
}
bool CompileShaderSimple(int sid, string source, bool required)
{
bool success = true;
ErrorCode errcode;
GL.ShaderSource(sid, source);
errcode = GL.GetError();
if (errcode != ErrorCode.NoError)
throw new InvalidOperationException("Error compiling shader (ShaderSource)" + errcode);
if (required)
throw new InvalidOperationException("Error compiling shader (ShaderSource)" + errcode);
else success = false;
GL.CompileShader(sid);
errcode = GL.GetError();
@ -504,13 +525,19 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.OpenTK
string resultLog = GL.GetShaderInfoLog(sid);
if (errcode != ErrorCode.NoError)
throw new InvalidOperationException("Error compiling shader (CompileShader)" + errcode + "\r\n\r\n" + resultLog);
if (required)
throw new InvalidOperationException("Error compiling shader (CompileShader)" + errcode + "\r\n\r\n" + resultLog);
else success = false;
int n;
GL.GetShader(sid, ShaderParameter.CompileStatus, out n);
if(n==0)
throw new InvalidOperationException("Error compiling shader (CompileShader)" + "\r\n\r\n" + resultLog);
if (n == 0)
if (required)
throw new InvalidOperationException("Error compiling shader (CompileShader)" + "\r\n\r\n" + resultLog);
else success = false;
return success;
}
void UnbindVertexAttributes()

6
Bizware/BizHawk.Bizware.BizwareGL.OpenTK/RetroShader.cs
View File

@ -25,9 +25,9 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.OpenTK
string vsSource = "#define VERTEX\r\n" + source;
string psSource = "#define FRAGMENT\r\n" + source;
var vs = Owner.CreateVertexShader(vsSource);
var ps = Owner.CreateFragmentShader(psSource);
Pipeline = Owner.CreatePipeline(VertexLayout, vs, ps);
var vs = Owner.CreateVertexShader(vsSource, false);
var ps = Owner.CreateFragmentShader(psSource, false);
Pipeline = Owner.CreatePipeline(VertexLayout, vs, ps, false);
}
public void Dispose()

6
Bizware/BizHawk.Bizware.BizwareGL/GuiRenderer.cs
View File

@ -28,9 +28,9 @@ namespace BizHawk.Bizware.BizwareGL
_Projection = new MatrixStack();
_Modelview = new MatrixStack();
var vs = Owner.CreateVertexShader(DefaultVertexShader);
var ps = Owner.CreateFragmentShader(DefaultPixelShader);
CurrPipeline = DefaultPipeline = Owner.CreatePipeline(VertexLayout, vs, ps);
var vs = Owner.CreateVertexShader(DefaultVertexShader,true);
var ps = Owner.CreateFragmentShader(DefaultPixelShader, true);
CurrPipeline = DefaultPipeline = Owner.CreatePipeline(VertexLayout, vs, ps, true);
}
public void Dispose()

6
Bizware/BizHawk.Bizware.BizwareGL/IGL.cs
View File

@ -49,17 +49,17 @@ namespace BizHawk.Bizware.BizwareGL
/// <summary>
/// compile a fragment shader. This is the simplified method. A more complex method may be added later which will accept multiple sources and preprocessor definitions independently
/// </summary>
Shader CreateFragmentShader(string source);
Shader CreateFragmentShader(string source, bool required);
/// <summary>
/// compile a vertex shader. This is the simplified method. A more complex method may be added later which will accept multiple sources and preprocessor definitions independently
/// </summary>
Shader CreateVertexShader(string source);
Shader CreateVertexShader(string source, bool required);
/// <summary>
/// Creates a complete pipeline from the provided vertex and fragment shader handles
/// </summary>
Pipeline CreatePipeline(VertexLayout vertexLayout, Shader vertexShader, Shader fragmentShader);
Pipeline CreatePipeline(VertexLayout vertexLayout, Shader vertexShader, Shader fragmentShader, bool required);
/// <summary>
/// Binds this pipeline as the current used for rendering

12
Bizware/BizHawk.Bizware.BizwareGL/Pipeline.cs
View File

@ -8,11 +8,12 @@ namespace BizHawk.Bizware.BizwareGL
/// </summary>
public class Pipeline : IDisposable
{
public Pipeline(IGL owner, IntPtr id, VertexLayout vertexLayout, IEnumerable<UniformInfo> uniforms)
public Pipeline(IGL owner, IntPtr id, bool available, VertexLayout vertexLayout, IEnumerable<UniformInfo> uniforms)
{
Owner = owner;
Id = id;
VertexLayout = vertexLayout;
Available = available;
//create the uniforms from the info list we got
UniformsDictionary = new SpecialWorkingDictionary(this);
@ -67,14 +68,7 @@ namespace BizHawk.Bizware.BizwareGL
public IGL Owner { get; private set; }
public IntPtr Id { get; private set; }
public VertexLayout VertexLayout { get; private set; }
///// <summary>
///// Makes the pipeline current
///// </summary>
//public void BindData()
//{
// Owner.BindPipeline(this);
//}
public bool Available { get; private set; }
public void Dispose()
{

4
Bizware/BizHawk.Bizware.BizwareGL/Shader.cs
View File

@ -8,15 +8,17 @@ namespace BizHawk.Bizware.BizwareGL
/// </summary>
public class Shader : IDisposable
{
public Shader(IGL owner, IntPtr id)
public Shader(IGL owner, IntPtr id, bool available)
{
Owner = owner;
Id = id;
Available = available;
}
public IGL Owner { get; private set; }
public IntPtr Id { get; private set; }
public bool Disposed { get; private set; }
public bool Available { get; private set; }
public void Dispose()
{