Skip to content

Make r_lightmode 0 work with material system #1794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make r_lightmode 0 work with material system #1794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/engine/renderer/GeometryOptimiser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,12 +645,12 @@ std::vector<MaterialSurface> OptimiseMapGeometryMaterial( world_t* world, bspSur
uint32_t texData = lhs.texDataDynamic[stage]
? ( lhs.texDataIDs[stage] + materialSystem.GetTexDataSize() ) << TEX_BUNDLE_BITS
: lhs.texDataIDs[stage] << TEX_BUNDLE_BITS;
texData |= ( HasLightMap( &lhs ) ? GetLightMapNum( &lhs ) : 255 ) << LIGHTMAP_BITS;
texData |= MaterialSystem::GetLightMapIdx( lhs, tr.worldLight ) << LIGHTMAP_BITS;

uint32_t texData2 = rhs.texDataDynamic[stage]
? ( rhs.texDataIDs[stage] + materialSystem.GetTexDataSize() ) << TEX_BUNDLE_BITS
: rhs.texDataIDs[stage] << TEX_BUNDLE_BITS;
texData2 |= ( HasLightMap( &rhs ) ? GetLightMapNum( &rhs ) : 255 ) << LIGHTMAP_BITS;
texData2 |= MaterialSystem::GetLightMapIdx( rhs, tr.worldLight ) << LIGHTMAP_BITS;

if ( texData < texData2 ) {
return true;
Expand Down
14 changes: 13 additions & 1 deletion src/engine/renderer/Material.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,18 @@ void MaterialSystem::GenerateTexturesBuffer( std::vector<TextureData>& textures,
}
}

int MaterialSystem::GetLightMapIdx( const MaterialSurface &surface, lightMode_t mode )
{
if ( mode == lightMode_t::MAP )
{
return GetLightMapNum( &surface ) & 255;
Copy link
Contributor

@VReaperV VReaperV Sep 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not having HasLightMap() can cause a crash on some maps IIRC.

}
else
{
return 255;
}
}

// This generates the buffers with indirect rendering commands etc.
void MaterialSystem::GenerateWorldCommandBuffer( std::vector<MaterialSurface>& surfaces ) {
Log::Debug( "Generating world command buffer" );
Expand Down Expand Up @@ -680,7 +692,7 @@ void MaterialSystem::GenerateWorldCommandBuffer( std::vector<MaterialSurface>& s
surfaceCommand.drawCommand.baseInstance |= surface.texDataDynamic[stage]
? ( surface.texDataIDs[stage] + texData.size() ) << TEX_BUNDLE_BITS
: surface.texDataIDs[stage] << TEX_BUNDLE_BITS;
surfaceCommand.drawCommand.baseInstance |= ( HasLightMap( &surface ) ? GetLightMapNum( &surface ) : 255 ) << LIGHTMAP_BITS;
surfaceCommand.drawCommand.baseInstance |= GetLightMapIdx( surface, tr.worldLight ) << LIGHTMAP_BITS;
surfaceCommands[cmdID] = surfaceCommand;

material->drawCommandCount++;
Expand Down
2 changes: 2 additions & 0 deletions src/engine/renderer/Material.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,8 @@ class MaterialSystem {

bool frameStart = false;

static int GetLightMapIdx( const MaterialSurface &surface, lightMode_t mode );

void AddPortalSurfaces();
void AddAutospriteSurfaces();
void RenderMaterials( const shaderSort_t fromSort, const shaderSort_t toSort, const uint32_t viewID );
Expand Down