Remove Material texture cache #2850
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
The Material texture cache caused many more problems than it solved, so this removes it until a complete solution can be found. This fix exposed several bad tests that were actually using the default texture instead of waiting for an image material uniform to load. These tests have been fixed. This fix also exposed another bug as well, which caused a material rendered with the default texture and then destroyed to end up destroying the default texture. Since textures are not reference counted, I simply added an `isDefault` flag for now and had Material.destroy only destroy the texture if it was not the default texture.
This was referenced Jun 30, 2015
| @@ -148,6 +148,7 @@ define([ | |||
| this._preMultiplyAlpha = preMultiplyAlpha; | |||
| this._flipY = flipY; | |||
| this._sampler = undefined; | |||
| this.isDefault = false; | |||
There was a problem hiding this comment.
Instead of polluting Texture and Context with this, can this be handled all in Material?
There was a problem hiding this comment.
I did it this way to avoid everyone having to handle it differently, but since Material is the only thing using defaultTexture right now, yes we can handle it all in Material.
Cache the default texture and use reference comparison to avoid destroying it.
|
Ready for another look. |
|
Thanks. |
pjcozzi
added a commit
that referenced
this pull request
Jun 30, 2015
…exture-cache Remove Material texture cache
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.
The Material texture cache caused many more problems than it solved, so this removes it until a complete solution can be found.
This fix exposed several bad tests that were actually using the default texture instead of waiting for an image material uniform to load. These tests have been fixed.
This fix also exposed another bug as well, which caused a material rendered with the default texture and then destroyed to end up destroying the default texture. Since textures are not reference counted, I simply added an
isDefaultflag for now and had Material.destroy only destroy the texture if it was not the default texture.This PR supercesedes #2843 and #2633. Also fixes #2821