Skip to content

Commit 6553041

Browse files
committed
Allow merging main surfaces regardless of fogNum
These surfaces themselves won't be used to render fog, instead that is done by adding surfaces referencing the same geometry, but using one of `tr.fogEqualShader` or `tr.fogLEShader`.
1 parent c8f03f9 commit 6553041

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

src/engine/renderer/tr_main.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1863,7 +1863,9 @@ int R_AddDrawSurf( surfaceType_t *surface, shader_t *shader, int lightmapNum, in
18631863
drawSurf->surface = surface;
18641864
drawSurf->shader = shader;
18651865
drawSurf->bspSurface = bspSurface;
1866-
drawSurf->fog = fogNum;
1866+
/* Allow the renderer backend to merge main surfaces that have fog, ignoring the fogNum,
1867+
as it only matters for the emitted fog surfaces */
1868+
drawSurf->fog = ( shader == tr.fogEqualShader || shader == tr.fogLEShader ) ? fogNum : 0;
18671869
drawSurf->portalNum = portalNum;
18681870

18691871
int entityNum;

0 commit comments

Comments
 (0)