X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fmixer%2Fimage%2Fimage_shader.cpp;h=6d89630c2c2da0a54a550ac7b2537109d1c1d3ca;hb=580d5b82595893c83f7bf715c94de20b70745ae4;hp=85ceb4cca1ccdd2e7bd1529a7155a6ea74f75dfe;hpb=116e09a218cf056e4de868454b0fe26dc4db1413;p=casparcg

diff --git a/core/mixer/image/image_shader.cpp b/core/mixer/image/image_shader.cpp
index 85ceb4cca..6d89630c2 100644
--- a/core/mixer/image/image_shader.cpp
+++ b/core/mixer/image/image_shader.cpp
@@ -69,12 +69,15 @@ std::string get_blend_color_func()
 	"																					\n"																			  
 	"vec4 blend(vec4 fore)																\n"
 	"{																					\n"
-	"   vec4 back = texture2D(background, gl_TexCoord[1].st).bgra;						\n"	
-	"																					\n"		
-	"	if(blend_mode == 29) // mix														\n"
-	"		return fore + back;															\n"
-	"																					\n"		
+	"   vec4 back = texture2D(background, gl_TexCoord[1].st).bgra;						\n"		
 	"	fore.rgb = get_blend_color(back.rgb, fore.rgb);									\n"
+	"																					\n"		
+	"	switch(keyer)																	\n"
+	"	{																				\n"
+	"		case 0: return fore + (1.0-fore.a)*back; // linear							\n"
+	"		case 1: return fore + back; // additive										\n"
+	"	}																				\n"
+	"																					\n"					
 	"	return fore + (1.0-fore.a)*back;												\n"
 	"}																					\n";			
 }
@@ -119,7 +122,7 @@ std::string get_fragment(bool blend_modes)
 	"uniform bool		has_local_key;													\n"
 	"uniform bool		has_layer_key;													\n"
 	"uniform int		blend_mode;														\n"
-	"uniform int		alpha_mode;														\n"
+	"uniform int		keyer;															\n"
 	"uniform int		pixel_format;													\n"
 	"																					\n"
 	"uniform float		opacity;														\n"