Skip to content

tr_shader: rework the non-delayed texture loading, fix loading legacy diffuse stage#1918

Open
illwieckz wants to merge 1 commit intofor-0.56.0/syncfrom
illwieckz/delayfix
Open

tr_shader: rework the non-delayed texture loading, fix loading legacy diffuse stage#1918
illwieckz wants to merge 1 commit intofor-0.56.0/syncfrom
illwieckz/delayfix

Conversation

@illwieckz
Copy link
Member

@illwieckz illwieckz commented Feb 27, 2026

I thought it was clever to detect a non-delayed legacy stage was one because the bundle index was TB_COLORMAP, but then it means every legacy diffuse stage is seen as delayed and non-legacy, because TB_DIFFUSEMAP equals TB_COLORMAP (and that is wanted). So all legacy stage textures loaded properly (normal map, specular map) but the color map.

So I reworked that to fix the bug and make the code nicer.

@illwieckz
Copy link
Member Author

Before:

unvanquished_2026-02-27_132448_000

After:

unvanquished_2026-02-27_132534_000

@slipher
Copy link
Member

slipher commented Feb 27, 2026

This breaks something with Xonotic normal or height maps.

Before:
image

After:
image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants