X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tests%2Fglsl%2Ffunction_overloading.glsl;h=a44c00d4459fe1bce58e4fb680b46bed03315507;hb=3ffa465364a36477b81b1b644ae8d19ee3bac8c2;hp=f74a793ba47ab0821180f0ee779d4d2a77daf984;hpb=4790c6a06072814b21f5b3f24b53c6936915308d;p=libs%2Fgl.git

diff --git a/tests/glsl/function_overloading.glsl b/tests/glsl/function_overloading.glsl
index f74a793b..a44c00d4 100644
--- a/tests/glsl/function_overloading.glsl
+++ b/tests/glsl/function_overloading.glsl
@@ -5,8 +5,8 @@ uniform vec3 ambient;
 vec3 srgb_to_linear(vec3 color)
 {
 	bvec3 near_zero = lessThan(color, vec3(0.04045));
-	vec3 gamma = pow((color.rgb+0.055)/1.055, vec3(2.4));
-	return mix(color.rgb/12.92, gamma, near_zero);
+	vec3 gamma = pow((color+0.055)/1.055, vec3(2.4));
+	return mix(color/12.92, gamma, near_zero);
 }
 vec4 srgb_to_linear(vec4 color)
 {
@@ -30,10 +30,10 @@ void main()
 }
 
 /* Expected output: vertex
-uniform mat4 mvp;
+layout(location=0) uniform mat4 mvp;
 layout(location=0) in vec4 position;
 layout(location=1) in vec2 texcoord;
-out vec2 _vs_out_texcoord;
+layout(location=0) out vec2 _vs_out_texcoord;
 void main()
 {
   _vs_out_texcoord = texcoord;
@@ -42,13 +42,13 @@ void main()
 */
 
 /* Expected output: fragment
-uniform sampler2D tex;
+layout(location=4, binding=71) uniform sampler2D tex;
 layout(location=0) out vec4 frag_color;
-in vec2 _vs_out_texcoord;
+layout(location=0) in vec2 _vs_out_texcoord;
 void main()
 {
 	vec4 color = texture(tex, _vs_out_texcoord);
-	vec3 _srgb_to_linear_color = color.rgb;
-	frag_color = vec4(mix(_srgb_to_linear_color.rgb/12.92, pow((_srgb_to_linear_color.rgb+0.055)/1.055, vec3(2.4)), lessThan(_srgb_to_linear_color, vec3(0.04045))), color.a);
+	vec3 color_1 = color.rgb;
+	frag_color = vec4(mix(color_1/12.92, pow((color_1+0.055)/1.055, vec3(2.4)), lessThan(color_1, vec3(0.04045))), color.a);
 }
 */