Use grid deluxe for world with r_lightMode 2

Increased macro permutations isn't much of a concern any more since
we don't build unused ones by default.

Author: slipher

src/engine/renderer/gl_shader.cpp

@@ -2112,7 +2112,7 @@ bool GLCompileMacro_USE_GRID_DELUXE_MAPPING::HasConflictingMacros(size_t permuta
 {
 	for (const GLCompileMacro* macro : macros)
 	{
-		if ((permutation & macro->GetBit()) != 0 && (macro->GetType() == USE_DELUXE_MAPPING || macro->GetType() == USE_BSP_SURFACE))
+		if ((permutation & macro->GetBit()) != 0 && (macro->GetType() == USE_DELUXE_MAPPING))
 		{
 			return true;
 		}
@@ -2140,19 +2140,6 @@ bool GLCompileMacro_USE_GRID_LIGHTING::HasConflictingMacros(size_t permutation,
 	return false;
 }
 
-bool GLCompileMacro_USE_BSP_SURFACE::HasConflictingMacros(size_t permutation, const std::vector<GLCompileMacro*> &macros) const
-{
-	for (const GLCompileMacro* macro : macros)
-	{
-		if ((permutation & macro->GetBit()) != 0 && (macro->GetType() == USE_GRID_DELUXE_MAPPING))
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
 void GLShader::RegisterUniform( GLUniform* uniform ) {
 	_uniforms.push_back( uniform );
 }

src/engine/renderer/gl_shader.h

@@ -1029,8 +1029,6 @@ class GLCompileMacro_USE_BSP_SURFACE :
 		return "USE_BSP_SURFACE";
 	}
 
-	bool HasConflictingMacros(size_t permutation, const std::vector< GLCompileMacro * > &macros) const override;
-
 	EGLCompileMacro GetType() const override
 	{
 		return EGLCompileMacro::USE_BSP_SURFACE;

src/engine/renderer/tr_bsp.cpp

@@ -4657,7 +4657,11 @@ static void SetWorldLight() {
 			// Game model surfaces use grid lighting, they don't have vertex light colors.
 			tr.modelDeluxe = deluxeMode_t::GRID;
 
-			// Only game models use emulated deluxe map from light direction grid.
+			// Only game models use emulated deluxe map from light direction grid, unless the
+			// `r_lightMode 2` debug option is used.
+			if ( tr.worldLight == lightMode_t::GRID ) {
+				tr.worldDeluxe = deluxeMode_t::GRID;
+			}
 		}
 	}