Fix sky brushes not being skipped for rendererSurfaces

Author: VReaperV

src/engine/renderer/GeometryOptimiser.cpp

@@ -377,7 +377,10 @@ std::vector<MaterialSurface> OptimiseMapGeometryMaterial(bspSurface_t** renderer
 		MaterialSurface srf {};
 
 		srf.shader = surface->shader;
+
 		srf.bspSurface = true;
+		srf.skyBrush = surface->skyBrush;
+
 		srf.lightMapNum = surface->lightmapNum;
 		srf.fog = surface->fogIndex;
 		srf.portalNum = surface->portalNum;

src/engine/renderer/Material.cpp

@@ -638,6 +638,10 @@ void MaterialSystem::GenerateWorldCommandBuffer( std::vector<MaterialSurface>& s
 	}
 
 	for ( MaterialSurface& surface : surfaces ) {
+		if ( surface.skyBrush ) {
+			continue;
+		}
+
 		SurfaceDescriptor surfaceDescriptor;
 		VectorCopy( surface.origin, surfaceDescriptor.boundingSphere.origin );
 		surfaceDescriptor.boundingSphere.radius = surface.radius;
@@ -1328,6 +1332,10 @@ void MaterialSystem::GenerateMaterial( MaterialSurface* surface ) {
 
 	uint32_t stage = 0;
 	uint32_t previousMaterialID = 0;
+
+	if ( surface->skyBrush ) {
+		return;
+	}
 
 	if ( surface->shader->depthShader ) {
 		uint32_t unused;

src/engine/renderer/Material.h

@@ -77,7 +77,10 @@ struct DrawCommand {
 struct MaterialSurface {
 	shader_t* shader;
 	surfaceType_t* surface;
+
 	bool bspSurface;
+	bool skyBrush;
+
 	int16_t lightMapNum;
 	int fog;
 	int portalNum = -1;

src/engine/renderer/tr_bsp.cpp

@@ -2538,7 +2538,7 @@ static void R_CreateWorldVBO() {
 		// HACK: portals: don't use VBO because when adding a portal we have to read back the verts CPU-side
 		// Autosprite: don't use VBO because verts are rewritten each time based on view origin
 		if ( surface->shader->isPortal || surface->shader->autoSpriteMode != 0 ) {
-			if( glConfig2.usingMaterialSystem && surface->shader->autoSpriteMode ) {
+			if( glConfig2.usingMaterialSystem ) {
 				materialSystem.autospriteSurfaces.push_back( surface );
 			}
 
@@ -2548,10 +2548,15 @@ static void R_CreateWorldVBO() {
 			continue;
 		}
 
-		if ( glConfig2.usingMaterialSystem && surface->shader->isSky
-			&& std::find( materialSystem.skyShaders.begin(), materialSystem.skyShaders.end(), surface->shader )
-			== materialSystem.skyShaders.end() ) {
-			materialSystem.skyShaders.emplace_back( surface->shader );
+		if ( glConfig2.usingMaterialSystem && surface->shader->isSky ) {
+			if ( std::find( materialSystem.skyShaders.begin(), materialSystem.skyShaders.end(), surface->shader )
+				== materialSystem.skyShaders.end() ) {
+				materialSystem.skyShaders.emplace_back( surface->shader );
+			}
+
+			/* Sky brushes are currently not used by the material system,
+			but they still have to go into the VBO for the core renderer */
+			surface->skyBrush = true;
 		}
 
 		if ( *surface->data == surfaceType_t::SF_FACE || *surface->data == surfaceType_t::SF_GRID

src/engine/renderer/tr_local.h

@@ -1830,6 +1830,7 @@ enum class ssaoMode {
 
 		bool renderable = false;
 		bool BSPModel = false;
+		bool skyBrush = false;
 
 		surfaceType_t   *data; // any of srf*_t
 	};