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

HexTiling: Define symbol to fix Mesa Intel compile issue; fix PI constant #2344

Merged
merged 1 commit into from
Oct 6, 2023

Conversation

emminizer
Copy link
Contributor

I have a Linux system that's picking up the embedded Intel HD Graphics 630, which is using the Mesa 22.3.0 driver. osgEarth is crashing (see #2343) for me. The other PR deals with the CXX cause of the crash. This change fixes the runtime issue.

The GLSL compiler is not happy with the file having no symbols defined and gives 0:279(1): error: syntax error, unexpected end of file. This fixes that problem by defining some symbols -- any symbol would be fine including void doNothing() {} -- outside of the VP_STAGE_FRAGMENT ifdef.

After this change, Intel Mesa runs fine with no issues.

I also noticed that M_PI was off on a digit so I updated that.

@gwaldron
Copy link
Owner

gwaldron commented Oct 2, 2023

Thanks Dan. Didn't you hear that pi had been updated?

@gwaldron gwaldron merged commit 8fbfda3 into gwaldron:master Oct 6, 2023
3 checks passed
@emminizer emminizer deleted the hex-fix-mesa-intel branch October 10, 2023 13:05
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.

2 participants