From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 8 Mar 2021 15:37:06 +0000 (+0200)
Subject: Fix some errors in test cases
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=2ea7ee3257a76aa4279fd82ff71c5abd6867f47a;p=libs%2Fgl.git

Fix some errors in test cases
---

diff --git a/tests/glsl/arithmetic_assignment.glsl b/tests/glsl/arithmetic_assignment.glsl
index adb2a0cb..d6c48ad8 100644
--- a/tests/glsl/arithmetic_assignment.glsl
+++ b/tests/glsl/arithmetic_assignment.glsl
@@ -18,7 +18,7 @@ void main()
 out vec4 frag_color;
 void main()
 {
-	vec3 color = texture(tex, texcoord);
+	vec3 color = texture(tex, texcoord).rgb;
 	color *= tint;
 	color *= light;
 	color += ambient;
@@ -49,7 +49,7 @@ in vec2 _vs_out_texcoord;
 in float light;
 void main()
 {
-  vec3 color = texture(tex, _vs_out_texcoord);
+  vec3 color = texture(tex, _vs_out_texcoord).rgb;
   color *= tint;
   color *= light;
   color += ambient;
diff --git a/tests/glsl/expression_inline_precedence.glsl b/tests/glsl/expression_inline_precedence.glsl
index 9f37c83b..c78958f7 100644
--- a/tests/glsl/expression_inline_precedence.glsl
+++ b/tests/glsl/expression_inline_precedence.glsl
@@ -1,6 +1,6 @@
 #pragma MSP stage(vertex)
 layout(location=0) in vec4 position;
-layout(location=1) in float v;
+layout(location=1) in vec4 v;
 void main()
 {
 	float a = v.x-v.y;
@@ -14,7 +14,7 @@ void main()
 
 /* Expected output: vertex
 layout(location=0) in vec4 position;
-layout(location=1) in float v;
+layout(location=1) in vec4 v;
 void main()
 {
 	gl_Position = position*((v.x-v.y-(v.z-v.w))+(v.x-v.y)*(v.z-v.w));