joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix D3D pixel shaders

Browse Source
This commit is contained in:
Wengier
2021-11-10 23:13:01 -05:00
parent 6960bc073f
commit 37f3a9745d
12 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@@ -55,6 +55,8 @@
- Fixed possible crash with printing. (jamesbond3142) - Fixed possible crash with printing. (jamesbond3142)
- Fixed possible freeze when shutting down Windows 9x - Fixed possible freeze when shutting down Windows 9x
after changing a CD image from the menu. (Wengier) after changing a CD image from the menu. (Wengier)
- Fixed some Direct3D pixel shaders not working (such
as GS2x and CRT-geom-blend). (Wengier & depaljas)
- Fixed config option windowposition=x,y not working - Fixed config option windowposition=x,y not working
in Linux/macOS SDL1 builds. (Wengier) in Linux/macOS SDL1 builds. (Wengier)
- Make memory B0000-B7FFF unmapped for the CGA - Make memory B0000-B7FFF unmapped for the CGA

4
contrib/windows/shaders/4xSoft.fx
View File

@@ -29,7 +29,7 @@
float scaling : SCALING = 1.1; float scaling : SCALING = 1.1;
string preprocessTechique : PREPROCESSTECHNIQUE = "soft"; string preprocessTechique : PREPROCESSTECHNIQUE = "soft";
string combineTechique : COMBINETECHNIQUE = "linear"; string combineTechique : COMBINETECHNIQUE = "lin";
VERTEX_STUFF4 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0) VERTEX_STUFF4 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0)
@@ -112,7 +112,7 @@ technique soft
} }
} }
technique linear technique lin
{ {
pass P0 pass P0
{ {

4
contrib/windows/shaders/GS2x.fx
View File

@@ -30,7 +30,7 @@ float scaling : SCALING = 1.1;
string preprocessTechique : PREPROCESSTECHNIQUE = "GS2x"; string preprocessTechique : PREPROCESSTECHNIQUE = "GS2x";
string combineTechique : COMBINETECHNIQUE = "linear"; string combineTechique : COMBINETECHNIQUE = "lin";
VERTEX_STUFF1 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0) VERTEX_STUFF1 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0)
@@ -103,7 +103,7 @@ technique GS2x
} }
technique linear technique lin
{ {
pass P0 pass P0
{ {

4
contrib/windows/shaders/GS2xFilter.fx
View File

@@ -36,7 +36,7 @@ const float lum_add = 0.25; // effects smoothing
string preprocessTechique : PREPROCESSTECHNIQUE = "GS2x"; string preprocessTechique : PREPROCESSTECHNIQUE = "GS2x";
string combineTechique : COMBINETECHNIQUE = "linear"; string combineTechique : COMBINETECHNIQUE = "lin";
VERTEX_STUFF0 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0) VERTEX_STUFF0 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0)
@@ -130,7 +130,7 @@ technique GS2x
} }
technique linear technique lin
{ {
pass P0 pass P0
{ {

4
contrib/windows/shaders/GS2xSuper.fx
View File

@@ -30,7 +30,7 @@ float scaling : SCALING = 1.1;
string preprocessTechique : PREPROCESSTECHNIQUE = "GS2xSuper"; string preprocessTechique : PREPROCESSTECHNIQUE = "GS2xSuper";
string combineTechique : COMBINETECHNIQUE = "linear"; string combineTechique : COMBINETECHNIQUE = "lin";
VERTEX_STUFF1 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0) VERTEX_STUFF1 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0)
@@ -100,7 +100,7 @@ technique GS2xSuper
} }
technique linear technique lin
{ {
pass P0 pass P0
{ {

4
contrib/windows/shaders/GS2xTwo.fx
View File

@@ -30,7 +30,7 @@ float scaling : SCALING = 1.1;
string preprocessTechique : PREPROCESSTECHNIQUE = "GS2xTwo"; string preprocessTechique : PREPROCESSTECHNIQUE = "GS2xTwo";
string combineTechique : COMBINETECHNIQUE = "linear"; string combineTechique : COMBINETECHNIQUE = "lin";
VERTEX_STUFF1 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0) VERTEX_STUFF1 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0)
@@ -102,7 +102,7 @@ technique GS2xTwo
} }
technique linear technique lin
{ {
pass P0 pass P0
{ {

4
contrib/windows/shaders/GS4x.fx
View File

@@ -30,7 +30,7 @@ float scaling : SCALING = 1.1;
string preprocessTechique : PREPROCESSTECHNIQUE = "GS4x"; string preprocessTechique : PREPROCESSTECHNIQUE = "GS4x";
string combineTechique : COMBINETECHNIQUE = "linear"; string combineTechique : COMBINETECHNIQUE = "lin";
VERTEX_STUFF2 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0) VERTEX_STUFF2 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0)
@@ -114,7 +114,7 @@ technique GS4x
} }
technique linear technique lin
{ {
pass P0 pass P0
{ {

4
contrib/windows/shaders/GS4xColorScale.fx
View File

@@ -55,7 +55,7 @@ float scaling : SCALING = 1.1;
string preprocessTechique : PREPROCESSTECHNIQUE = "GS4x"; string preprocessTechique : PREPROCESSTECHNIQUE = "GS4x";
string combineTechique : COMBINETECHNIQUE = "linear"; string combineTechique : COMBINETECHNIQUE = "lin";
VERTEX_STUFF2 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0) VERTEX_STUFF2 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0)
@@ -145,7 +145,7 @@ technique GS4x
} }
technique linear technique lin
{ {
pass P0 pass P0
{ {

4
contrib/windows/shaders/GS4xFilter.fx
View File

@@ -35,7 +35,7 @@ const float min_w = 0.05; // min filter weigth
const float lum_add = 0.33; // effects smoothing const float lum_add = 0.33; // effects smoothing
string preprocessTechique : PREPROCESSTECHNIQUE = "GS4xFilter"; string preprocessTechique : PREPROCESSTECHNIQUE = "GS4xFilter";
string combineTechique : COMBINETECHNIQUE = "linear"; string combineTechique : COMBINETECHNIQUE = "lin";
VERTEX_STUFF4 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0) VERTEX_STUFF4 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0)
@@ -135,7 +135,7 @@ technique GS4xFilter
} }
technique linear technique lin
{ {
pass P0 pass P0
{ {

4
contrib/windows/shaders/GS4xScale.fx
View File

@@ -30,7 +30,7 @@ float scaling : SCALING = 1.1;
string preprocessTechique : PREPROCESSTECHNIQUE = "GS4x"; string preprocessTechique : PREPROCESSTECHNIQUE = "GS4x";
string combineTechique : COMBINETECHNIQUE = "linear"; string combineTechique : COMBINETECHNIQUE = "lin";
VERTEX_STUFF2 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0) VERTEX_STUFF2 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0)
@@ -114,7 +114,7 @@ technique GS4x
} }
technique linear technique lin
{ {
pass P0 pass P0
{ {

4
contrib/windows/shaders/GS4xSoft.fx
View File

@@ -30,7 +30,7 @@ float scaling : SCALING = 1.1;
string preprocessTechique : PREPROCESSTECHNIQUE = "GS4x"; string preprocessTechique : PREPROCESSTECHNIQUE = "GS4x";
string combineTechique : COMBINETECHNIQUE = "linear"; string combineTechique : COMBINETECHNIQUE = "lin";
VERTEX_STUFF2 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0) VERTEX_STUFF2 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0)
@@ -114,7 +114,7 @@ technique GS4x
} }
technique linear technique lin
{ {
pass P0 pass P0
{ {

4
contrib/windows/shaders/Gs2xLS.fx
View File

@@ -30,7 +30,7 @@ float scaling : SCALING = 1.1;
string preprocessTechique : PREPROCESSTECHNIQUE = "GS2x"; string preprocessTechique : PREPROCESSTECHNIQUE = "GS2x";
string combineTechique : COMBINETECHNIQUE = "linear"; string combineTechique : COMBINETECHNIQUE = "lin";
VERTEX_STUFF1 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0) VERTEX_STUFF1 PASS1_VERTEX (float3 p : POSITION, float2 tc : TEXCOORD0)
@@ -103,7 +103,7 @@ technique GS2x
} }
technique linear technique lin
{ {
pass P0 pass P0
{ {