X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Funlit.glsl;h=a7d75c3248a59150e9cd70fa749ce05df975eb16;hb=HEAD;hp=f4920a7982db397babd59fcc61e66dc725a55dbf;hpb=ae423e6ef278388f92802fbae34b1c7ec339292f;p=libs%2Fgl.git

diff --git a/shaderlib/unlit.glsl b/shaderlib/unlit.glsl
index f4920a79..a7d75c32 100644
--- a/shaderlib/unlit.glsl
+++ b/shaderlib/unlit.glsl
@@ -6,18 +6,17 @@ struct UnlitMaterialParameters
 	vec4 color;
 };
 
-uniform UnlitMaterial
+layout(set=1) uniform UnlitMaterial
 {
 	UnlitMaterialParameters unlit_material;
-	float alpha_cutoff;
+	AlphaCutoffParams alpha_cutoff;
 };
 
-uniform sampler2D color_tex;
+layout(set=1) uniform sampler2D color_tex;
 
 layout(constant_id=auto) const bool use_texture = false;
 layout(constant_id=auto) const bool use_vertex_color = false;
 layout(constant_id=auto) const bool use_fog = false;
-layout(constant_id=auto) const bool use_alpha_cutoff = false;
 
 #pragma MSP stage(fragment)
 virtual vec4 get_color()
@@ -33,8 +32,7 @@ virtual vec4 get_color()
 void main()
 {
 	vec4 color = get_color();
-	if(use_alpha_cutoff && color.a<alpha_cutoff)
-		discard;
+	color.a = apply_alpha_cutoff(color.a, alpha_cutoff);
 
 	if(use_fog)
 		color.rgb = apply_fog(color.rgb);