@@ -895,7 +895,7 @@ static void Render_lightMapping( shaderStage_t *pStage )
895
895
{
896
896
// Use fullbright on “surfaceparm nolightmap” materials.
897
897
}
898
- else if ( ! pStage->implicitLightmap && pStage-> type != stageType_t::ST_LIGHTMAP )
898
+ else if ( pStage->type == stageType_t::ST_COLLAPSE_COLORMAP )
899
899
{
900
900
/* Use fullbright for collapsed stages without lightmaps,
901
901
for example:
@@ -2789,14 +2789,13 @@ void Tess_StageIteratorGeneric()
2789
2789
2790
2790
case stageType_t::ST_LIGHTMAP:
2791
2791
case stageType_t::ST_DIFFUSEMAP:
2792
- case stageType_t::ST_COLLAPSE_lighting_PHONG :
2793
- case stageType_t::ST_COLLAPSE_lighting_PBR :
2792
+ case stageType_t::ST_COLLAPSE_COLORMAP :
2793
+ case stageType_t::ST_COLLAPSE_DIFFUSEMAP :
2794
2794
Render_lightMapping ( pStage );
2795
-
2796
2795
break ;
2797
2796
2798
- case stageType_t::ST_COLLAPSE_reflection_CB:
2799
2797
case stageType_t::ST_REFLECTIONMAP:
2798
+ case stageType_t::ST_COLLAPSE_REFLECTIONMAP:
2800
2799
if ( r_reflectionMapping->integer )
2801
2800
{
2802
2801
Render_reflection_CB ( pStage );
@@ -2836,7 +2835,7 @@ void Tess_StageIteratorGeneric()
2836
2835
{
2837
2836
/* FIXME: workaround to display something and not crash
2838
2837
when liquidMapping is enabled, until we fix liquidMap. */
2839
- pStage->type = stageType_t::ST_DIFFUSEMAP ;
2838
+ pStage->type = stageType_t::ST_COLLAPSE_DIFFUSEMAP ;
2840
2839
pStage->bundle [ TB_DIFFUSEMAP ].image [ 0 ] = tr.whiteImage ;
2841
2840
Render_lightMapping ( pStage );
2842
2841
}
@@ -2906,10 +2905,10 @@ void Tess_StageIteratorPortal() {
2906
2905
case stageType_t::ST_COLORMAP:
2907
2906
case stageType_t::ST_LIGHTMAP:
2908
2907
case stageType_t::ST_DIFFUSEMAP:
2909
- case stageType_t::ST_COLLAPSE_lighting_PHONG:
2910
- case stageType_t::ST_COLLAPSE_lighting_PBR:
2911
- case stageType_t::ST_COLLAPSE_reflection_CB:
2908
+ case stageType_t::ST_COLLAPSE_COLORMAP:
2909
+ case stageType_t::ST_COLLAPSE_DIFFUSEMAP:
2912
2910
case stageType_t::ST_REFLECTIONMAP:
2911
+ case stageType_t::ST_COLLAPSE_REFLECTIONMAP:
2913
2912
case stageType_t::ST_REFRACTIONMAP:
2914
2913
case stageType_t::ST_DISPERSIONMAP:
2915
2914
case stageType_t::ST_SKYBOXMAP:
@@ -2989,8 +2988,8 @@ void Tess_StageIteratorDepthFill()
2989
2988
2990
2989
case stageType_t::ST_LIGHTMAP:
2991
2990
case stageType_t::ST_DIFFUSEMAP:
2992
- case stageType_t::ST_COLLAPSE_lighting_PHONG :
2993
- case stageType_t::ST_COLLAPSE_lighting_PBR :
2991
+ case stageType_t::ST_COLLAPSE_COLORMAP :
2992
+ case stageType_t::ST_COLLAPSE_DIFFUSEMAP :
2994
2993
Render_depthFill ( pStage );
2995
2994
break ;
2996
2995
@@ -3066,8 +3065,8 @@ void Tess_StageIteratorShadowFill()
3066
3065
3067
3066
case stageType_t::ST_LIGHTMAP:
3068
3067
case stageType_t::ST_DIFFUSEMAP:
3069
- case stageType_t::ST_COLLAPSE_lighting_PHONG :
3070
- case stageType_t::ST_COLLAPSE_lighting_PBR :
3068
+ case stageType_t::ST_COLLAPSE_COLORMAP :
3069
+ case stageType_t::ST_COLLAPSE_DIFFUSEMAP :
3071
3070
Render_shadowFill ( pStage );
3072
3071
break ;
3073
3072
@@ -3180,8 +3179,7 @@ void Tess_StageIteratorLighting()
3180
3179
switch ( pStage->type )
3181
3180
{
3182
3181
case stageType_t::ST_DIFFUSEMAP:
3183
- case stageType_t::ST_COLLAPSE_lighting_PBR:
3184
- case stageType_t::ST_COLLAPSE_lighting_PHONG:
3182
+ case stageType_t::ST_COLLAPSE_DIFFUSEMAP:
3185
3183
if ( light->l .rlType == refLightType_t::RL_OMNI )
3186
3184
{
3187
3185
Render_forwardLighting_DBS_omni ( pStage, attenuationXYStage, attenuationZStage, light );
0 commit comments