Skip to content
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.

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

Use the correct amount of texture units #1122

Merged
merged 2 commits into from
May 18, 2024

Conversation

VReaperV
Copy link
Contributor

@VReaperV VReaperV commented May 9, 2024

Query the actual max amount of texture units with GL_MAX_COMBINED_TEXTURE_UNITS instead of a magic number, and use an std::vector with this capacity.

Copy link
Member

@illwieckz illwieckz left a comment

Choose a reason for hiding this comment

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

LGTM.

src/engine/renderer/tr_backend.cpp Outdated Show resolved Hide resolved
src/engine/renderer/tr_backend.cpp Outdated Show resolved Hide resolved
src/engine/renderer/tr_local.h Outdated Show resolved Hide resolved
@slipher
Copy link
Member

slipher commented May 11, 2024

LGTM

Query the actual max amount of texture units with GL_MAX_COMBINED_TEXTURE_UNITS and use an std::vector with this capacity
Move it to tr so we can keep memset for glState
@VReaperV
Copy link
Contributor Author

Squashed the commit with minor fixes from reviews, no code changes here.

@VReaperV VReaperV merged commit 40ed394 into DaemonEngine:master May 18, 2024
9 checks passed
@VReaperV VReaperV deleted the texture-units branch May 18, 2024 08:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants