From 3de2427e7ce6d2f4c1b47188d2a8d37604ca9178 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sat, 21 Dec 2019 01:34:51 +0100 Subject: [PATCH] Removed -f suffixes for floats (not supported on AMD) --- Source/Core/Resources/display2d.vp | 2 +- Source/Core/Resources/display2d_fsaa.fp | 2 +- Source/Core/Resources/things2d.vp | 2 +- Source/Core/Resources/things2d_sprite.fp | 2 +- Source/Core/Resources/world3d_fullbright.fp | 2 +- Source/Core/Resources/world3d_fullbright_highlight.fp | 2 +- Source/Core/Resources/world3d_lightpass.fp | 2 +- Source/Core/Resources/world3d_main.fp | 2 +- Source/Core/Resources/world3d_main_fog.fp | 2 +- Source/Core/Resources/world3d_main_highlight.fp | 2 +- Source/Core/Resources/world3d_main_highlight_fog.fp | 2 +- Source/Core/Resources/world3d_skybox.fp | 2 +- Source/Core/Resources/world3d_vertex_color.fp | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/Core/Resources/display2d.vp b/Source/Core/Resources/display2d.vp index 478e82eb..4d00806c 100644 --- a/Source/Core/Resources/display2d.vp +++ b/Source/Core/Resources/display2d.vp @@ -10,7 +10,7 @@ uniform mat4 projection; void main() { - gl_Position = projection * vec4(AttrPosition, 1.0f); + gl_Position = projection * vec4(AttrPosition, 1.0); Color = AttrColor; UV = AttrUV; } diff --git a/Source/Core/Resources/display2d_fsaa.fp b/Source/Core/Resources/display2d_fsaa.fp index e9aa65a2..59cec51b 100644 --- a/Source/Core/Resources/display2d_fsaa.fp +++ b/Source/Core/Resources/display2d_fsaa.fp @@ -36,7 +36,7 @@ void main() vec4 c = texture(texture1, UV); // If this pixel is not drawn on... - if(c.a < 0.1f) + if(c.a < 0.1) { // Mix the colors of nearby pixels vec4 n = vec4(0.0); diff --git a/Source/Core/Resources/things2d.vp b/Source/Core/Resources/things2d.vp index 478e82eb..4d00806c 100644 --- a/Source/Core/Resources/things2d.vp +++ b/Source/Core/Resources/things2d.vp @@ -10,7 +10,7 @@ uniform mat4 projection; void main() { - gl_Position = projection * vec4(AttrPosition, 1.0f); + gl_Position = projection * vec4(AttrPosition, 1.0); Color = AttrColor; UV = AttrUV; } diff --git a/Source/Core/Resources/things2d_sprite.fp b/Source/Core/Resources/things2d_sprite.fp index abfb2269..bd26a71f 100644 --- a/Source/Core/Resources/things2d_sprite.fp +++ b/Source/Core/Resources/things2d_sprite.fp @@ -27,7 +27,7 @@ void main() if (Color.a > 0.0) { vec3 cr = desaturate(c.rgb); - FragColor = vec4((cr.r + Color.r) / 2.0f, (cr.g + Color.g) / 2.0f, (cr.b + Color.b) / 2.0f, c.a * rendersettings.w * Color.a); + FragColor = vec4((cr.r + Color.r) / 2.0, (cr.g + Color.g) / 2.0, (cr.b + Color.b) / 2.0, c.a * rendersettings.w * Color.a); } else { diff --git a/Source/Core/Resources/world3d_fullbright.fp b/Source/Core/Resources/world3d_fullbright.fp index 61489725..0be00c5f 100644 --- a/Source/Core/Resources/world3d_fullbright.fp +++ b/Source/Core/Resources/world3d_fullbright.fp @@ -23,5 +23,5 @@ void main() if (FragColor.a < 0.5) discard; #endif - if (fogsettings.x >= 0.0f) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); + if (fogsettings.x >= 0.0) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); } diff --git a/Source/Core/Resources/world3d_fullbright_highlight.fp b/Source/Core/Resources/world3d_fullbright_highlight.fp index 4d914973..1da98e35 100644 --- a/Source/Core/Resources/world3d_fullbright_highlight.fp +++ b/Source/Core/Resources/world3d_fullbright_highlight.fp @@ -33,5 +33,5 @@ void main() if (FragColor.a < 0.5) discard; #endif - if (fogsettings.x >= 0.0f) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); + if (fogsettings.x >= 0.0) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); } diff --git a/Source/Core/Resources/world3d_lightpass.fp b/Source/Core/Resources/world3d_lightpass.fp index 432c1bf6..c0fc3ba4 100644 --- a/Source/Core/Resources/world3d_lightpass.fp +++ b/Source/Core/Resources/world3d_lightpass.fp @@ -56,7 +56,7 @@ void main() lightColorMod.rgb *= df; } - if (lightColor.a > 0.979f && lightColor.a < 0.981f) // attenuated light 98% + if (lightColor.a > 0.979 && lightColor.a < 0.981) // attenuated light 98% lightColorMod.rgb *= diffuseContribution; if (lightColorMod.r <= 0.0 && lightColorMod.g <= 0.0 && lightColorMod.b <= 0.0) diff --git a/Source/Core/Resources/world3d_main.fp b/Source/Core/Resources/world3d_main.fp index f0d955b7..0c3bd48d 100644 --- a/Source/Core/Resources/world3d_main.fp +++ b/Source/Core/Resources/world3d_main.fp @@ -29,5 +29,5 @@ void main() if (FragColor.a < 0.5) discard; #endif - if (fogsettings.x >= 0.0f) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); + if (fogsettings.x >= 0.0) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); } diff --git a/Source/Core/Resources/world3d_main_fog.fp b/Source/Core/Resources/world3d_main_fog.fp index 289a3231..73d2a99e 100644 --- a/Source/Core/Resources/world3d_main_fog.fp +++ b/Source/Core/Resources/world3d_main_fog.fp @@ -50,5 +50,5 @@ void main() if (FragColor.a < 0.5) discard; #endif - if (fogsettings.x >= 0.0f) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); + if (fogsettings.x >= 0.0) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); } diff --git a/Source/Core/Resources/world3d_main_highlight.fp b/Source/Core/Resources/world3d_main_highlight.fp index 6cff6de4..5d2a76f6 100644 --- a/Source/Core/Resources/world3d_main_highlight.fp +++ b/Source/Core/Resources/world3d_main_highlight.fp @@ -40,5 +40,5 @@ void main() if (FragColor.a < 0.5) discard; #endif - if (fogsettings.x >= 0.0f) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); + if (fogsettings.x >= 0.0) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); } diff --git a/Source/Core/Resources/world3d_main_highlight_fog.fp b/Source/Core/Resources/world3d_main_highlight_fog.fp index 23e33c75..486436ae 100644 --- a/Source/Core/Resources/world3d_main_highlight_fog.fp +++ b/Source/Core/Resources/world3d_main_highlight_fog.fp @@ -54,5 +54,5 @@ void main() if (FragColor.a < 0.5) discard; #endif - if (fogsettings.x >= 0.0f) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); + if (fogsettings.x >= 0.0) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); } diff --git a/Source/Core/Resources/world3d_skybox.fp b/Source/Core/Resources/world3d_skybox.fp index 4fd6506b..14f0bf43 100644 --- a/Source/Core/Resources/world3d_skybox.fp +++ b/Source/Core/Resources/world3d_skybox.fp @@ -20,5 +20,5 @@ void main() if (FragColor.a < 0.5) discard; #endif - if (fogsettings.x >= 0.0f) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); + if (fogsettings.x >= 0.0) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); } diff --git a/Source/Core/Resources/world3d_vertex_color.fp b/Source/Core/Resources/world3d_vertex_color.fp index bf872588..3100ef13 100644 --- a/Source/Core/Resources/world3d_vertex_color.fp +++ b/Source/Core/Resources/world3d_vertex_color.fp @@ -16,5 +16,5 @@ void main() if (FragColor.a < 0.5) discard; #endif - if (fogsettings.x >= 0.0f) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); + if (fogsettings.x >= 0.0) FragColor = mix(FragColor, fogcolor, clamp((-viewpos.z - fogsettings.x) / (fogsettings.y - fogsettings.x), 0.0, 1.0)); }