Cleanup: remove GLShader::MissesRequiredMacros

For checking if a macro can't be used without another macro, we can
just use HasConflictingMacros(). No need to have separate functions
to check flags that must be on and flags that must be off.

The one override of MissesRequiredMacros wasn't even using it for the
right thing (a global GL config setting instead of a macro).

Author: slipher

src/engine/renderer/gl_shader.cpp

@@ -870,7 +870,11 @@ static bool IsUnusedPermutation( const char *compileMacros )
 	const char* token;
 	while ( *( token = COM_ParseExt2( &compileMacros, false ) ) )
 	{
-		if ( strcmp( token, "USE_DELUXE_MAPPING" ) == 0 )
+		if ( strcmp( token, "USE_VERTEX_SKINNING" ) == 0 )
+		{
+			if ( !glConfig.vboVertexSkinningAvailable ) return true;
+		}
+		else if ( strcmp( token, "USE_DELUXE_MAPPING" ) == 0 )
 		{
 			if ( !glConfig.deluxeMapping ) return true;
 		}
@@ -2044,11 +2048,6 @@ bool GLCompileMacro_USE_VERTEX_SKINNING::HasConflictingMacros( size_t permutatio
 	return false;
 }
 
-bool GLCompileMacro_USE_VERTEX_SKINNING::MissesRequiredMacros( size_t /*permutation*/, const std::vector< GLCompileMacro * > &/*macros*/ ) const
-{
-	return !glConfig.vboVertexSkinningAvailable;
-}
-
 bool GLCompileMacro_USE_VERTEX_ANIMATION::HasConflictingMacros( size_t permutation, const std::vector< GLCompileMacro * > &macros ) const
 {
 	for (const GLCompileMacro* macro : macros)
@@ -2248,10 +2247,6 @@ uint32_t GLShader::GetUniqueCompileMacros( size_t permutation, const int type )
 				continue;
 			}
 
-			if ( macro->MissesRequiredMacros( permutation, _compileMacros ) ) {
-				continue;
-			}
-
 			if ( !( macro->GetShaderTypes() & type ) ) {
 				continue;
 			}
@@ -2272,10 +2267,6 @@ bool GLShader::GetCompileMacrosString( size_t permutation, std::string &compileM
 				return false;
 			}
 
-			if ( macro->MissesRequiredMacros( permutation, _compileMacros ) ) {
-				return false;
-			}
-
 			if ( !( macro->GetShaderTypes() & type ) ) {
 				return false;
 			}

src/engine/renderer/gl_shader.h

@@ -952,11 +952,6 @@ class GLCompileMacro
 		return false;
 	}
 
-	virtual bool            MissesRequiredMacros( size_t, const std::vector<GLCompileMacro*>& ) const
-	{
-		return false;
-	}
-
 	virtual uint32_t        GetRequiredVertexAttributes() const
 	{
 		return 0;
@@ -1075,7 +1070,6 @@ class GLCompileMacro_USE_VERTEX_SKINNING :
 	}
 
 	bool HasConflictingMacros( size_t permutation, const std::vector< GLCompileMacro * > &macros ) const override;
-	bool MissesRequiredMacros( size_t permutation, const std::vector< GLCompileMacro * > &macros ) const override;
 
 	uint32_t        GetRequiredVertexAttributes() const override
 	{