Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-30 22:57:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Properly use identity / identitylighting when cgen isn't explicitly specified

Browse source
This commit is contained in:
smallmodel 2024-02-12 23:47:07 +01:00
parent 0b16d599d5
commit 51ba1e2951
No known key found for this signature in database
GPG key ID: A96F163ED4891440
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
code/renderer/tr_shader.c
View file

@ -1684,10 +1684,11 @@ static qboolean ParseStage(shaderStage_t* stage, char** text)
// if cgen isn't explicitly specified, use either identity or identitylighting // if cgen isn't explicitly specified, use either identity or identitylighting
// //
if ( stage->rgbGen == CGEN_BAD ) { if ( stage->rgbGen == CGEN_BAD ) {
if ( (!cntBundle && !stage->bundle[0].isLightmap) || if (cntBundle || stage->bundle[0].isLightmap) {
blendSrcBits == 0 || stage->rgbGen = CGEN_IDENTITY;
} else if (blendSrcBits == 0 ||
blendSrcBits == GLS_SRCBLEND_ONE || blendSrcBits == GLS_SRCBLEND_ONE ||
blendSrcBits == GLS_SRCBLEND_SRC_ALPHA ) { blendSrcBits == GLS_SRCBLEND_SRC_ALPHA) {
stage->rgbGen = CGEN_IDENTITY_LIGHTING; stage->rgbGen = CGEN_IDENTITY_LIGHTING;
} else { } else {
stage->rgbGen = CGEN_IDENTITY; stage->rgbGen = CGEN_IDENTITY;
@ -1709,7 +1710,7 @@ static qboolean ParseStage(shaderStage_t* stage, char** text)
} }
// decide which agens we can skip // decide which agens we can skip
if ( stage->alphaGen == CGEN_IDENTITY ) { if ( stage->alphaGen == AGEN_IDENTITY ) {
if ( stage->rgbGen == CGEN_IDENTITY if ( stage->rgbGen == CGEN_IDENTITY
|| stage->rgbGen == CGEN_LIGHTING_GRID || stage->rgbGen == CGEN_LIGHTING_GRID
|| stage->rgbGen == CGEN_LIGHTING_SPHERICAL ) { || stage->rgbGen == CGEN_LIGHTING_SPHERICAL ) {