Fix incorrect SamplerParams operators #7150
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
romainguy
approved these changes
Sep 8, 2023
| @@ -838,6 +838,7 @@ struct SamplerParams { // NOLINT | |||
| return SamplerParams::LessThan{}(lhs, rhs); | |||
| } | |||
| }; | |||
| static_assert(sizeof(SamplerParams) == 4); | |||
suzp1984
reviewed
Sep 8, 2023
| @@ -813,22 +813,22 @@ struct SamplerParams { // NOLINT | |||
| struct Hasher { | |||
| size_t operator()(SamplerParams p) const noexcept { | |||
| // we don't use std::hash<> here, so we don't have to include <functional> | |||
| return *reinterpret_cast<uint64_t const*>(reinterpret_cast<char const*>(&p)); | |||
| return *reinterpret_cast<uint32_t const*>(reinterpret_cast<char const*>(&p)); | |||
There was a problem hiding this comment.
Is there any conflict with #7104 ?
This was causing the OpenGL backend to assert on x86_64 Macs:
It seems it's not just an OpenGL backend issue.
There was a problem hiding this comment.
#7104 was the cause of the bug, yes. And certainly this could affect backends other than OpenGL, but the assert that was firing was specific to the OpenGL backend.
poweifeng
pushed a commit
that referenced
this pull request
Sep 12, 2023
plepers
pushed a commit
to plepers/filament
that referenced
this pull request
Dec 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This was causing the OpenGL backend to assert on x86_64 Macs: