Remove redundant check for state.atlasTextureIcon in drawLayerSymbols #10038
Conversation
|
This double check was added in #8904 specifically https://github.com/mapbox/mapbox-gl-js/pull/8904/files#diff-32491b8d513a9d3eb4a65cd5b5ded4b70be4f2cea814adbc54f437eaccf1af0cR367-R372 so I don't believe it's an oversight. Changing the |
There was a problem hiding this comment.
Good catch!
Changing the activeTexture may update state.atlasTextureIcon.
@ryanhamley there's no chance for that, it will only set the active texture binder in the webgl context, no side effect involved.
| @@ -366,9 +366,7 @@ function drawLayerSymbols(painter, sourceCache, layer, coords, isText, translate | |||
| state.atlasTexture.bind(state.atlasInterpolation, gl.CLAMP_TO_EDGE); | |||
| if (state.atlasTextureIcon) { | |||
| context.activeTexture.set(gl.TEXTURE1); | |||
| if (state.atlasTextureIcon) { | |||
There was a problem hiding this comment.
Was this meant to check atlasInterpolationIcon maybe?
|
|
|
@JannikGM If you'd still like to contribute this, you will need to sign our new Contributor License Agreement. I'm going to close this as stale, but if you sign the CLA, we can re-open it. |
This removes a redundant check in
drawLayerSymbols.We already check for
state.atlasTextureIconin line 367, and (unless I'm missing something) it shouldn't have changed by line 369.(It would be nice if you can tag this PR for hacktoberfest inclusion as described in https://hacktoberfest.digitalocean.com/details#rules - feel free to ignore this last bit if you don't want this)