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

Limit samplers to 8 in combined.frag. #15754

Merged
merged 1 commit into from Nov 1, 2018

Conversation

Projects
None yet
3 participants
@pchote
Member

pchote commented Oct 29, 2018

The additional palette sampler wasn't accounted for in the original PR.
This fixes a crash on systems that support a max of 8.

Context: https://logs.openra.net/index.php?year=2018&month=10&day=29#13:09:31

Limit samplers to 8 in combined.frag.
The additional palette sampler wasn't accounted
for in the original PR.

@pchote pchote added this to the Hotfix release milestone Oct 29, 2018

@reaperrr

Looks good to me, and no regressions spotted in shipping mods

@abcdefg30 abcdefg30 merged commit 95c5c68 into OpenRA:bleed Nov 1, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@abcdefg30

This comment has been minimized.

Member

abcdefg30 commented Nov 1, 2018

@pchote pchote deleted the pchote:remove-sampler-nine branch Nov 18, 2018

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