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

improve d3d9 shader compatibility more

This commit is contained in:
zeromus 2015-10-24 01:32:44 -05:00
parent dc00fd0a4b
commit d422f02694
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Bizware/BizHawk.Bizware.BizwareGL.SlimDX/IGL_SlimDX9.cs
View File

@ -191,7 +191,10 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
string profile = "ps_1_0"; string profile = "ps_1_0";
if (cg) if (cg)
profile = "ps_3_0"; //todo - smarter logic somehow profile = "ps_3_0"; //todo - smarter logic somehow
bytecode = d3d9.ShaderBytecode.Compile(source, null, null, entry, profile, ShaderFlags.EnableBackwardsCompatibility, out errors);
//ShaderFlags.EnableBackwardsCompatibility - used this once upon a time (please leave a note about why)
//
bytecode = d3d9.ShaderBytecode.Compile(source, null, null, entry, profile, ShaderFlags.UseLegacyD3DX9_31Dll, out errors);
} }
catch (Exception ex) catch (Exception ex)
{ {

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

@ -375,13 +375,13 @@ struct VS_OUTPUT
{ {
float4 vPosition : POSITION; float4 vPosition : POSITION;
float2 vTexcoord0 : TEXCOORD0; float2 vTexcoord0 : TEXCOORD0;
float4 vCornerColor : TEXCOORD1; float4 vCornerColor : COLOR0;
}; };
struct PS_INPUT struct PS_INPUT
{ {
float2 vTexcoord0 : TEXCOORD0; float2 vTexcoord0 : TEXCOORD0;
float4 vCornerColor : TEXCOORD1; float4 vCornerColor : COLOR0;
}; };
VS_OUTPUT vsmain(VS_INPUT src) VS_OUTPUT vsmain(VS_INPUT src)

11
Bizware/BizHawk.Bizware.BizwareGL/RetroShader.cs
View File

@ -20,8 +20,9 @@ namespace BizHawk.Bizware.BizwareGL
Owner = owner; Owner = owner;
VertexLayout = owner.CreateVertexLayout(); VertexLayout = owner.CreateVertexLayout();
VertexLayout.DefineVertexAttribute("position", 0, 4, VertexAttribPointerType.Float, AttributeUsage.Position, false, 24, 0); VertexLayout.DefineVertexAttribute("position", 0, 4, VertexAttribPointerType.Float, AttributeUsage.Position, false, 40, 0);
VertexLayout.DefineVertexAttribute("texCoord1", 1, 2, VertexAttribPointerType.Float, AttributeUsage.Texcoord0, false, 24, 16); VertexLayout.DefineVertexAttribute("color", 1, 4, VertexAttribPointerType.Float, AttributeUsage.Color0, false, 40, 16); //just dead weight, i have no idea why this is here. but some old HLSL compilers (used in bizhawk for various reasons) will want it to exist here since it exists in the vertex shader
VertexLayout.DefineVertexAttribute("texCoord1", 2, 2, VertexAttribPointerType.Float, AttributeUsage.Texcoord0, false, 40, 32);
VertexLayout.Close(); VertexLayout.Close();
string defines = "#define TEXCOORD TEXCOORD0\r\n"; //maybe not safe.. string defines = "#define TEXCOORD TEXCOORD0\r\n"; //maybe not safe..
@ -106,15 +107,19 @@ namespace BizHawk.Bizware.BizwareGL
float v0,v1; float v0,v1;
if (flip) { v0 = 1; v1 = 0; } if (flip) { v0 = 1; v1 = 0; }
else { v0 = 0; v1 = 1; } else { v0 = 0; v1 = 1; }
float* pData = stackalloc float[8*4]; float* pData = stackalloc float[10*4];
int i=0; int i=0;
pData[i++] = 0; pData[i++] = 0; pData[i++] = 0; pData[i++] = 1; //topleft vert pData[i++] = 0; pData[i++] = 0; pData[i++] = 0; pData[i++] = 1; //topleft vert
pData[i++] = 0; pData[i++] = 0; pData[i++] = 0; pData[i++] = 0; //useless color
pData[i++] = 0; pData[i++] = v0; pData[i++] = 0; pData[i++] = v0;
pData[i++] = w; pData[i++] = 0; pData[i++] = 0; pData[i++] = 1; //topright vert pData[i++] = w; pData[i++] = 0; pData[i++] = 0; pData[i++] = 1; //topright vert
pData[i++] = 0; pData[i++] = 0; pData[i++] = 0; pData[i++] = 0; //useless color
pData[i++] = 1; pData[i++] = v0; pData[i++] = 1; pData[i++] = v0;
pData[i++] = 0; pData[i++] = h; pData[i++] = 0; pData[i++] = 1; //bottomleft vert pData[i++] = 0; pData[i++] = h; pData[i++] = 0; pData[i++] = 1; //bottomleft vert
pData[i++] = 0; pData[i++] = 0; pData[i++] = 0; pData[i++] = 0; //useless color
pData[i++] = 0; pData[i++] = v1; pData[i++] = 0; pData[i++] = v1;
pData[i++] = w; pData[i++] = h; pData[i++] = 0; pData[i++] = 1; //bottomright vert pData[i++] = w; pData[i++] = h; pData[i++] = 0; pData[i++] = 1; //bottomright vert
pData[i++] = 0; pData[i++] = 0; pData[i++] = 0; pData[i++] = 0; //useless color
pData[i++] = 1; pData[i++] = v1; pData[i++] = 1; pData[i++] = v1;
Owner.SetBlendState(Owner.BlendNoneCopy); Owner.SetBlendState(Owner.BlendNoneCopy);