From 674e9f3c86d0f141c0731163617224e3f69bf2ee Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 19 Aug 2013 12:36:16 +1200 Subject: [PATCH] Remove hardcoded alpha-blend from Cg shaders. Fixes #3707 --- cg/line.fx | 5 ----- cg/rgba.fx | 6 ------ cg/shp.fx | 6 ------ cg/vxl.fx | 6 ------ 4 files changed, 23 deletions(-) diff --git a/cg/line.fx b/cg/line.fx index 156f18f5c9..1286e90384 100644 --- a/cg/line.fx +++ b/cg/line.fx @@ -44,12 +44,7 @@ technique high_quality { technique high_quality_cg21 { pass p0 { DepthTestEnable = false; - //CullMode = None; - //FillMode = Wireframe; VertexProgram = compile arbvp1 Simple_vp(); FragmentProgram = compile arbfp1 Simple_fp(); - - BlendEquation = FuncAdd; - BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha ); } } \ No newline at end of file diff --git a/cg/rgba.fx b/cg/rgba.fx index ffea272583..2ac03df92a 100644 --- a/cg/rgba.fx +++ b/cg/rgba.fx @@ -43,9 +43,6 @@ technique high_quality { CullFaceEnable = false; VertexProgram = compile latest Simple_vp(); FragmentProgram = compile latest Simple_fp(); - - BlendEquation = FuncAdd; - BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha ); } } @@ -55,8 +52,5 @@ technique high_quality_cg21 { CullFaceEnable = false; VertexProgram = compile arbvp1 Simple_vp(); FragmentProgram = compile arbfp1 Simple_fp(); - - BlendEquation = FuncAdd; - BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha ); } } \ No newline at end of file diff --git a/cg/shp.fx b/cg/shp.fx index 8bca263e41..53cbd27473 100644 --- a/cg/shp.fx +++ b/cg/shp.fx @@ -59,9 +59,6 @@ technique low_quality { CullFaceEnable = false; VertexProgram = compile latest Simple_vp(); FragmentProgram = compile latest Palette_fp(); - - BlendEquation = FuncAdd; - BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha ); } } @@ -71,8 +68,5 @@ technique low_quality_cg21 { CullFaceEnable = false; VertexProgram = compile arbvp1 Simple_vp(); FragmentProgram = compile arbfp1 Palette_fp(); - - BlendEquation = FuncAdd; - BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha ); } } \ No newline at end of file diff --git a/cg/vxl.fx b/cg/vxl.fx index efaf711432..6d2423b9e3 100644 --- a/cg/vxl.fx +++ b/cg/vxl.fx @@ -65,9 +65,6 @@ technique high_quality { CullFaceEnable = false; VertexProgram = compile latest Simple_vp(); FragmentProgram = compile latest Simple_fp(); - - BlendEquation = FuncAdd; - BlendFunc = int2(SrcAlpha, OneMinusSrcAlpha); } } @@ -77,8 +74,5 @@ technique high_quality_cg21 { CullFaceEnable = false; VertexProgram = compile arbvp1 Simple_vp(); FragmentProgram = compile arbfp1 Simple_fp(); - - BlendEquation = FuncAdd; - BlendFunc = int2(SrcAlpha, OneMinusSrcAlpha); } } \ No newline at end of file