fixup-smoothstep

Author: illwieckz

src/engine/renderer/GLUtils.h

@@ -130,7 +130,6 @@ struct GLConfig
 	bool textureGatherAvailable;
 	bool texture3DAvailable;
 	bool mat3x2Available;
-	bool assumeSmoothstep;
 	bool incrementalShaderCompilation;
 	int maxDrawBuffers;
 

src/engine/renderer/gl_shader.cpp

@@ -544,9 +544,16 @@ R"(#if !defined(GENERATED_COMPAT_HEADER)
 )";
 
 	// definition of functions missing in early GLSL
-	if( glConfig.shadingLanguageVersion <= 120 && !glConfig.assumeSmoothstep ) {
-		str += "float smoothstep(float edge0, float edge1, float x) { float t = clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0); return t * t * (3.0 - 2.0 * t); }\n";
-	}
+	str +=
+R"(#if __VERSION__ <= 120
+float mySmoothstep(float edge0, float edge1, float x)
+{
+	float t = clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0);
+	return t * t * (3.0 - 2.0 * t);
+}
+#define smoothstep mySmoothstep
+#endif
+)";
 
 	if ( !glConfig.gpuShader5Available && glConfig.gpuShader4Available )
 	{

src/engine/sys/sdl_glimp.cpp

@@ -151,10 +151,6 @@ static Cvar::Cvar<bool> workaround_glDriver_amd_oglp_disableBindlessTexture(
 	"workaround.glDriver.amd.oglp.disableBindlessTexture",
 	"Disable ARB_bindless_texture on AMD OGLP driver",
 	Cvar::NONE, true );
-static Cvar::Cvar<bool> workaround_glDriver_gl4es_assumeSmoothstep(
-	"workaround.glDriver.gl4es.assumeSmoothstep",
-	"Assume smoothstep is always declared on GL4ES",
-	Cvar::NONE, true );
 static Cvar::Cvar<bool> workaround_glDriver_gl4es_disableIncrementalShaderCompilation(
 	"workaround.glDriver.gl4es.disableIncrementalShaderCompilation",
 	"Disable incremental shader compilation on GL4ES",
@@ -2117,13 +2113,6 @@ static void GLimp_InitExtensions()
 
 	if ( glConfig.driverVendor == glDriverVendor_t::GL4ES )
 	{
-		if ( glConfig.shadingLanguageVersion <= 120
-			&& workaround_glDriver_gl4es_assumeSmoothstep.Get() )
-		{
-			logger.Notice( "Found GLSL 1.20 on GL4ES translation layer, assuming smoothstep() is always declared." );
-			glConfig.assumeSmoothstep = true;
-		}
-
 		if ( glConfig.incrementalShaderCompilation
 			&& workaround_glDriver_gl4es_disableIncrementalShaderCompilation.Get() )
 		{
@@ -2985,7 +2974,6 @@ bool GLimp_Init()
 
 	Cvar::Latch( workaround_glDriver_amd_adrenalin_disableBindlessTexture );
 	Cvar::Latch( workaround_glDriver_amd_oglp_disableBindlessTexture );
-	Cvar::Latch( workaround_glDriver_gl4es_assumeSmoothstep );
 	Cvar::Latch( workaround_glDriver_gl4es_disableIncrementalShaderCompilation );
 	Cvar::Latch( workaround_glDriver_gl4es_disableMat3x2 );
 	Cvar::Latch( workaround_glDriver_gl4es_disableTexture3D );