Fix possible data races between the main and GL threads#2973
Merged
Conversation
opengl_Wrapper.h / .cpp — m_swapBuffersQueued → std::atomic<int> The counter was incremented from the main thread (SwapBuffers) and decremented from the GL command thread (ReduceSwapBuffersQueued), with no synchronization between the two writes. That's a data race — undefined behavior in C++. std::atomic<int> makes every read/write an atomic operation; the existing ++, --, and comparison operators all work unchanged. glsl_CombinerProgramBuilder.h / .cpp — s_cycleType and s_textureConvert → thread_local These were plain static class members set at the top of buildCombinerProgram and then read throughout all the _write* sub-functions. If two threads ever call buildCombinerProgram concurrently, one would stomp the other's values mid-build, corrupting shader generation. Changing them to thread_local gives each thread its own copy, so concurrent builds are isolated. No call-site changes needed — all the existing CombinerProgramBuilder::s_cycleType reads throughout the Accurate and Fast builder files automatically pick up the correct per-thread value.
Owner
Author
|
@fzurita please review |
Contributor
|
Yes, first issue is a real issue. Second issue with the static variables, I think that is unlikely to be triggered since I think we only ever have a single thread calling buildCombinerProgram if I recall correctly? Either way, I don't think it would hurt anything to make them local. |
Owner
Author
|
Good, thanks! |
This file contains hidden or 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
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.
opengl_Wrapper.h / .cpp — m_swapBuffersQueued → std::atomic
The counter was incremented from the main thread (SwapBuffers) and decremented from the GL command thread (ReduceSwapBuffersQueued), with no synchronization between the two writes. That's a data race — undefined behavior in C++. std::atomic makes every read/write an atomic operation; the existing ++, --, and comparison operators all work unchanged.
glsl_CombinerProgramBuilder.h / .cpp — s_cycleType and s_textureConvert → thread_local
These were plain static class members set at the top of buildCombinerProgram and then read throughout all the _write* sub-functions. If two threads ever call buildCombinerProgram concurrently, one would stomp the other's values mid-build, corrupting shader generation. Changing them to thread_local gives each thread its own copy, so concurrent builds are isolated. No call-site changes needed — all the existing CombinerProgramBuilder::s_cycleType reads throughout the Accurate and Fast builder files automatically pick up the correct per-thread value.