From 6142f469eb17c06a432fde663c36a0567985d986 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Tue, 16 Mar 2021 18:58:46 +0200 Subject: [PATCH] Test case tweaks --- tests/glsl/complex_constant_condition_removal.glsl | 2 +- tests/glsl/function_overloading.glsl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/glsl/complex_constant_condition_removal.glsl b/tests/glsl/complex_constant_condition_removal.glsl index 8a9d96ac..5a2c588f 100644 --- a/tests/glsl/complex_constant_condition_removal.glsl +++ b/tests/glsl/complex_constant_condition_removal.glsl @@ -15,7 +15,7 @@ void main() layout(location=0) out vec4 frag_color; void main() { - if(lod+biasthreshold)) frag_color = color; else frag_color = vec4(1.0); diff --git a/tests/glsl/function_overloading.glsl b/tests/glsl/function_overloading.glsl index f74a793b..e5561705 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) { @@ -49,6 +49,6 @@ 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); + frag_color = vec4(mix(_srgb_to_linear_color/12.92, pow((_srgb_to_linear_color+0.055)/1.055, vec3(2.4)), lessThan(_srgb_to_linear_color, vec3(0.04045))), color.a); } */ -- 2.45.2