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

fix texture data race #1202

Merged
merged 2 commits into from
Dec 28, 2016
Merged

fix texture data race #1202

merged 2 commits into from
Dec 28, 2016

Conversation

hjanetzek
Copy link
Member

@hjanetzek hjanetzek commented Dec 28, 2016

Sync m_atlasRefCount on m_textureMutex. I think this is important to go in soon.

Don't clear textures directly in releaseAtlas. This could clear the atlas while it's used in layoutText, before the atlas ref count got updated.

Edit (Varun): Fixes #1196

@hjanetzek hjanetzek added the bug label Dec 28, 2016
Copy link
Member

@tallytalwar tallytalwar left a comment

Choose a reason for hiding this comment

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

This is good. Merging.

karimnaaji and others added 2 commits December 28, 2016 10:56
- don't clear textures directly in releaseAtlas. This could clear the
  atlas while it's used in layoutText, before the atlas ref count got
  updated.
@tallytalwar tallytalwar force-pushed the wip-fix-texture-data-race branch from a72d4c5 to abbeba1 Compare December 28, 2016 15:57
@tallytalwar tallytalwar merged commit cd7fc64 into master Dec 28, 2016
@tallytalwar tallytalwar deleted the wip-fix-texture-data-race branch December 28, 2016 16:16
@tallytalwar tallytalwar restored the wip-fix-texture-data-race branch January 11, 2017 17:38
tallytalwar pushed a commit that referenced this pull request Jan 11, 2017
* Lock on texture mutex when updating atlas reference counts

* squash synchronize FontContext m_atlasRefs

- don't clear textures directly in releaseAtlas. This could clear the
  atlas while it's used in layoutText, before the atlas ref count got
  updated.
@matteblair matteblair deleted the wip-fix-texture-data-race branch January 13, 2017 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants