@@ -134,14 +134,14 @@ All of these functions must write stage material data regardless of whether pSta
134134because stages here are combined into as few as possible,
135135and the stage chosen for storage might not have all of those enabled */
136136
137- void UpdateSurfaceDataNONE ( uint32_t *, shaderStage_t*, bool , bool , bool ) {
137+ void UpdateSurfaceDataNONE ( uint32_t *, shaderStage_t*, bool , bool ) {
138138 ASSERT_UNREACHABLE ();
139139}
140140
141- void UpdateSurfaceDataNOP ( uint32_t *, shaderStage_t*, bool , bool , bool ) {
141+ void UpdateSurfaceDataNOP ( uint32_t *, shaderStage_t*, bool , bool ) {
142142}
143143
144- void UpdateSurfaceDataGeneric3D ( uint32_t * materials, shaderStage_t* pStage, bool mayUseVertexOverbright, bool , bool ) {
144+ void UpdateSurfaceDataGeneric3D ( uint32_t * materials, shaderStage_t* pStage, bool , bool ) {
145145 // shader_t* shader = pStage->shader;
146146
147147 materials += pStage->bufferOffset ;
@@ -154,7 +154,7 @@ void UpdateSurfaceDataGeneric3D( uint32_t* materials, shaderStage_t* pStage, boo
154154 alphaGen_t alphaGen = SetAlphaGen ( pStage );
155155
156156 const bool styleLightMap = pStage->type == stageType_t::ST_STYLELIGHTMAP || pStage->type == stageType_t::ST_STYLECOLORMAP;
157- gl_genericShaderMaterial->SetUniform_ColorModulateColorGen_Uint ( rgbGen, alphaGen, mayUseVertexOverbright, styleLightMap );
157+ gl_genericShaderMaterial->SetUniform_ColorModulateColorGen_Uint ( rgbGen, alphaGen, styleLightMap );
158158
159159 Tess_ComputeColor ( pStage );
160160 gl_genericShaderMaterial->SetUniform_Color_Uint ( tess.svars .color );
@@ -164,7 +164,7 @@ void UpdateSurfaceDataGeneric3D( uint32_t* materials, shaderStage_t* pStage, boo
164164 gl_genericShaderMaterial->WriteUniformsToBuffer ( materials );
165165}
166166
167- void UpdateSurfaceDataLightMapping ( uint32_t * materials, shaderStage_t* pStage, bool , bool vertexLit, bool fullbright ) {
167+ void UpdateSurfaceDataLightMapping ( uint32_t * materials, shaderStage_t* pStage, bool vertexLit, bool fullbright ) {
168168 shader_t * shader = pStage->shader ;
169169
170170 materials += pStage->bufferOffset ;
@@ -181,7 +181,7 @@ void UpdateSurfaceDataLightMapping( uint32_t* materials, shaderStage_t* pStage,
181181 }
182182
183183 // u_ColorModulate
184- gl_lightMappingShaderMaterial->SetUniform_ColorModulateColorGen_Uint ( rgbGen, alphaGen, false , !fullbright );
184+ gl_lightMappingShaderMaterial->SetUniform_ColorModulateColorGen_Uint ( rgbGen, alphaGen, !fullbright );
185185
186186 // u_Color
187187 gl_lightMappingShaderMaterial->SetUniform_Color_Uint ( tess.svars .color );
@@ -210,7 +210,7 @@ void UpdateSurfaceDataLightMapping( uint32_t* materials, shaderStage_t* pStage,
210210 gl_lightMappingShaderMaterial->WriteUniformsToBuffer ( materials );
211211}
212212
213- void UpdateSurfaceDataReflection ( uint32_t * materials, shaderStage_t* pStage, bool , bool , bool ) {
213+ void UpdateSurfaceDataReflection ( uint32_t * materials, shaderStage_t* pStage, bool , bool ) {
214214 shader_t * shader = pStage->shader ;
215215
216216 materials += pStage->bufferOffset ;
@@ -247,7 +247,7 @@ void UpdateSurfaceDataReflection( uint32_t* materials, shaderStage_t* pStage, bo
247247 gl_reflectionShaderMaterial->WriteUniformsToBuffer ( materials );
248248}
249249
250- void UpdateSurfaceDataSkybox ( uint32_t * materials, shaderStage_t* pStage, bool , bool , bool ) {
250+ void UpdateSurfaceDataSkybox ( uint32_t * materials, shaderStage_t* pStage, bool , bool ) {
251251 // shader_t* shader = pStage->shader;
252252
253253 materials += pStage->bufferOffset ;
@@ -258,7 +258,7 @@ void UpdateSurfaceDataSkybox( uint32_t* materials, shaderStage_t* pStage, bool,
258258 gl_skyboxShaderMaterial->WriteUniformsToBuffer ( materials );
259259}
260260
261- void UpdateSurfaceDataScreen ( uint32_t * materials, shaderStage_t* pStage, bool , bool , bool ) {
261+ void UpdateSurfaceDataScreen ( uint32_t * materials, shaderStage_t* pStage, bool , bool ) {
262262 // shader_t* shader = pStage->shader;
263263
264264 materials += pStage->bufferOffset ;
@@ -271,7 +271,7 @@ void UpdateSurfaceDataScreen( uint32_t* materials, shaderStage_t* pStage, bool,
271271 gl_screenShaderMaterial->WriteUniformsToBuffer ( materials );
272272}
273273
274- void UpdateSurfaceDataHeatHaze ( uint32_t * materials, shaderStage_t* pStage, bool , bool , bool ) {
274+ void UpdateSurfaceDataHeatHaze ( uint32_t * materials, shaderStage_t* pStage, bool , bool ) {
275275 // shader_t* shader = pStage->shader;
276276
277277 materials += pStage->bufferOffset ;
@@ -288,7 +288,7 @@ void UpdateSurfaceDataHeatHaze( uint32_t* materials, shaderStage_t* pStage, bool
288288 gl_heatHazeShaderMaterial->WriteUniformsToBuffer ( materials );
289289}
290290
291- void UpdateSurfaceDataLiquid ( uint32_t * materials, shaderStage_t* pStage, bool , bool , bool ) {
291+ void UpdateSurfaceDataLiquid ( uint32_t * materials, shaderStage_t* pStage, bool , bool ) {
292292 // shader_t* shader = pStage->shader;
293293
294294 materials += pStage->bufferOffset ;
@@ -334,7 +334,7 @@ void UpdateSurfaceDataLiquid( uint32_t* materials, shaderStage_t* pStage, bool,
334334 gl_liquidShaderMaterial->WriteUniformsToBuffer ( materials );
335335}
336336
337- void UpdateSurfaceDataFog ( uint32_t * materials, shaderStage_t* pStage, bool , bool , bool ) {
337+ void UpdateSurfaceDataFog ( uint32_t * materials, shaderStage_t* pStage, bool , bool ) {
338338 // shader_t* shader = pStage->shader;
339339
340340 materials += pStage->bufferOffset ;
@@ -436,14 +436,13 @@ void MaterialSystem::GenerateMaterialsBuffer( std::vector<shaderStage_t*>& stage
436436 uint32_t variants = 0 ;
437437 for ( int i = 0 ; i < ShaderStageVariant::ALL && variants < pStage->variantOffset ; i++ ) {
438438 if ( pStage->variantOffsets [i] != -1 ) {
439- const bool mayUseVertexOverbright = i & ShaderStageVariant::VERTEX_OVERBRIGHT;
440439 const bool vertexLit = i & ShaderStageVariant::VERTEX_LIT;
441440 const bool fullbright = i & ShaderStageVariant::FULLBRIGHT;
442441
443442 const uint32_t variantOffset = pStage->variantOffsets [i] * pStage->paddedSize ;
444443 pStage->bufferOffset += variantOffset;
445444
446- pStage->surfaceDataUpdater ( materialsData, pStage, mayUseVertexOverbright, vertexLit, fullbright );
445+ pStage->surfaceDataUpdater ( materialsData, pStage, vertexLit, fullbright );
447446
448447 pStage->bufferOffset -= variantOffset;
449448 variants++;
@@ -774,14 +773,10 @@ static std::string GetStageInfo( const shaderStage_t* pStage, const uint32_t dyn
774773 stageShaderNames.at ( pStage->shaderBinder ), pStage->materialOffset , pStage->bufferOffset );
775774
776775 static const char * stageVariants[] = {
777- " base variant " ,
778- " vertex overbright " ,
779- " vertex-lit " ,
780- " vertex overbright vertex-lit " ,
781- " fullbright " ,
782- " vertex overbright fullbright " ,
783- " vertex-lit fullbright " ,
784- " vertex overbright vertex-lit fullbright"
776+ " base variant " ,
777+ " vertex-lit " ,
778+ " fullbright " ,
779+ " vertex-lit fullbright" ,
785780 };
786781 static_assert ( ARRAY_LEN ( stageVariants ) == ShaderStageVariant::ALL,
787782 " update stage variant text descriptions" );
@@ -1272,8 +1267,8 @@ void ProcessMaterialFog( Material* material, shaderStage_t* pStage, MaterialSurf
12721267}
12731268
12741269void MaterialSystem::AddStage ( MaterialSurface* surface, shaderStage_t* pStage, uint32_t stage,
1275- const bool mayUseVertexOverbright, const bool vertexLit, const bool fullbright ) {
1276- const int variant = ( mayUseVertexOverbright ? ShaderStageVariant::VERTEX_OVERBRIGHT : 0 )
1270+ const bool vertexLit, const bool fullbright ) {
1271+ const int variant = 0
12771272 | ( vertexLit ? ShaderStageVariant::VERTEX_LIT : 0 )
12781273 | ( fullbright ? ShaderStageVariant::FULLBRIGHT : 0 );
12791274
@@ -1392,8 +1387,6 @@ void MaterialSystem::ProcessStage( MaterialSurface* surface, shaderStage_t* pSta
13921387 lightMode_t lightMode;
13931388 deluxeMode_t deluxeMode;
13941389 SetLightDeluxeMode ( surface, pStage, lightMode, deluxeMode );
1395- const bool mayUseVertexOverbright = pStage->type == stageType_t::ST_COLORMAP
1396- && surface->bspSurface && pStage->shaderBinder == BindShaderGeneric3D;
13971390 const bool vertexLit = lightMode == lightMode_t::VERTEX && pStage->shaderBinder == BindShaderLightMapping;
13981391 const bool fullbright = lightMode == lightMode_t::FULLBRIGHT && pStage->shaderBinder == BindShaderLightMapping;
13991392
@@ -1479,7 +1472,7 @@ void MaterialSystem::ProcessStage( MaterialSurface* surface, shaderStage_t* pSta
14791472 pStage->useMaterialSystem = true ;
14801473 pStage->initialized = true ;
14811474
1482- AddStage ( surface, pStage, stage, mayUseVertexOverbright, vertexLit, fullbright );
1475+ AddStage ( surface, pStage, stage, vertexLit, fullbright );
14831476 AddStageTextures ( surface, pStage, stage, &materials[previousMaterialID] );
14841477
14851478 surface->materialIDs [stage] = previousMaterialID;
0 commit comments