epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3708 from pchote/cg-fixup

Browse Source 
Remove hardcoded alpha-blend from Cg shaders.
This commit is contained in:
Matthias Mailänder
2013-08-19 10:46:19 -07:00
parent 2e4ded8f7a 674e9f3c86
commit bd0e29d274
4 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cg/line.fx
View File

@@ -44,12 +44,7 @@ technique high_quality {
technique high_quality_cg21 { technique high_quality_cg21 {
pass p0 { pass p0 {
DepthTestEnable = false; DepthTestEnable = false;
//CullMode = None;
//FillMode = Wireframe;
VertexProgram = compile arbvp1 Simple_vp(); VertexProgram = compile arbvp1 Simple_vp();
FragmentProgram = compile arbfp1 Simple_fp(); FragmentProgram = compile arbfp1 Simple_fp();
BlendEquation = FuncAdd;
BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha );
} }
} }

6
cg/rgba.fx
View File

@@ -43,9 +43,6 @@ technique high_quality {
CullFaceEnable = false; CullFaceEnable = false;
VertexProgram = compile latest Simple_vp(); VertexProgram = compile latest Simple_vp();
FragmentProgram = compile latest Simple_fp(); FragmentProgram = compile latest Simple_fp();
BlendEquation = FuncAdd;
BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha );
} }
} }
@@ -55,8 +52,5 @@ technique high_quality_cg21 {
CullFaceEnable = false; CullFaceEnable = false;
VertexProgram = compile arbvp1 Simple_vp(); VertexProgram = compile arbvp1 Simple_vp();
FragmentProgram = compile arbfp1 Simple_fp(); FragmentProgram = compile arbfp1 Simple_fp();
BlendEquation = FuncAdd;
BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha );
} }
} }

6
cg/shp.fx
View File

@@ -59,9 +59,6 @@ technique low_quality {
CullFaceEnable = false; CullFaceEnable = false;
VertexProgram = compile latest Simple_vp(); VertexProgram = compile latest Simple_vp();
FragmentProgram = compile latest Palette_fp(); FragmentProgram = compile latest Palette_fp();
BlendEquation = FuncAdd;
BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha );
} }
} }
@@ -71,8 +68,5 @@ technique low_quality_cg21 {
CullFaceEnable = false; CullFaceEnable = false;
VertexProgram = compile arbvp1 Simple_vp(); VertexProgram = compile arbvp1 Simple_vp();
FragmentProgram = compile arbfp1 Palette_fp(); FragmentProgram = compile arbfp1 Palette_fp();
BlendEquation = FuncAdd;
BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha );
} }
} }

6
cg/vxl.fx
View File

@@ -65,9 +65,6 @@ technique high_quality {
CullFaceEnable = false; CullFaceEnable = false;
VertexProgram = compile latest Simple_vp(); VertexProgram = compile latest Simple_vp();
FragmentProgram = compile latest Simple_fp(); FragmentProgram = compile latest Simple_fp();
BlendEquation = FuncAdd;
BlendFunc = int2(SrcAlpha, OneMinusSrcAlpha);
} }
} }
@@ -77,8 +74,5 @@ technique high_quality_cg21 {
CullFaceEnable = false; CullFaceEnable = false;
VertexProgram = compile arbvp1 Simple_vp(); VertexProgram = compile arbvp1 Simple_vp();
FragmentProgram = compile arbfp1 Simple_fp(); FragmentProgram = compile arbfp1 Simple_fp();
BlendEquation = FuncAdd;
BlendFunc = int2(SrcAlpha, OneMinusSrcAlpha);
} }
} }