bug fix for removing texture #1850
Closed
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
When a texture is set to null, GearVRf was not always regenerating the shader. This patch fixes that - issue Samsung#1848
liaxim
reviewed
Apr 25, 2018
| @@ -68,7 +68,7 @@ void ShaderData::setTexture(const char* key, Texture* texture) | |||
| if (temp.compare(key) == 0) | |||
| { | |||
| Texture* oldtex = mTextures[i]; | |||
| makeDirty(oldtex ? MOD_TEXTURE : NEW_TEXTURE); | |||
| makeDirty(((oldtex != nullptr) && (texture != nullptr)) ? MOD_TEXTURE : NEW_TEXTURE); | |||
There was a problem hiding this comment.
What is the difference between MOD_TEXTURE and NEW_TEXTURE? Also I don't see obvious use of MOD_TEXTURE.
|
MOD_TEXTURE means you are changing which texture the material uses. NEW_TEXTURE means that a) the material had a texture previously and you are removing it or b) the material did not have a texture previously and you are adding it. Cases A and B require the shader to be changed. MOD_TEXTURE does not. |
|
This PR is not finished yet. I am working with a user and there is still a case that fails. |
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.
When a texture is set to null, GearVRf was not always regenerating the shader. This patch fixes that - issue #1848.
GearVRF DCO signed off by: Nola Donato [email protected]