This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
Custom layer fixes #11239
Merged
Custom layer fixes #11239
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
Avoids problems on (amongst others) Samsung Galaxy J3
ivovandongen
added
Android
jfirebaugh
reviewed
Feb 19, 2018
| @@ -2,11 +2,114 @@ | |||
| #include <GLES2/gl2.h> | |||
|
|
|||
| #include <mbgl/util/logging.hpp> | |||
|
|
|||
| #include <mbgl/util/string.hpp> | |||
There was a problem hiding this comment.
We should probably remove the logging.hpp and string.hpp dependencies. I don't think we should encourage custom layer implementations to depend on anything other than custom_layer.hpp.
| @@ -46,11 +47,11 @@ void RenderCustomLayer::render(PaintParameters& paintParameters, RenderSource*) | |||
| if (context != impl().context || !initialized) { | |||
| //If the context changed, deinitialize the previous one before initializing the new one. | |||
| if (context && !contextDestroyed && impl().deinitializeFn) { | |||
| impl().deinitializeFn(context); | |||
| MBGL_CHECK_ERROR(impl().deinitializeFn(context)); | |||
…and string headers
|
@jfirebaugh Removed the dependencies on mbgl headers, expect for the custom layer specific. |
jfirebaugh
approved these changes
Feb 22, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #8448
Fixes two issues reported in #8448:
The issues where obscured by the fact that we don't have error checking in the custom layer functions (as it is external code). Any subsequent opengl operation would fail, hinting at unrelated points in the code. This pr adds some checks on calling into the custom layer code to render_custom_layer to makes sure these things are easier to catch.
Also added error checking code to the example custom layer to make debugging easier in the future.