Merge branch 'release-agua' back to master.
This commit is contained in:
@@ -43,20 +43,25 @@ std::unique_ptr<Bucket> RenderCustomLayer::createBucket(const BucketParameters&,
|
||||
}
|
||||
|
||||
void RenderCustomLayer::render(PaintParameters& paintParameters, RenderSource*) {
|
||||
if (!initialized) {
|
||||
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);
|
||||
}
|
||||
context = impl().context;
|
||||
assert(impl().initializeFn);
|
||||
impl().initializeFn(impl().context);
|
||||
initialized = true;
|
||||
}
|
||||
|
||||
gl::Context& context = paintParameters.context;
|
||||
gl::Context& glContext = paintParameters.context;
|
||||
const TransformState& state = paintParameters.state;
|
||||
|
||||
// Reset GL state to a known state so the CustomLayer always has a clean slate.
|
||||
context.bindVertexArray = 0;
|
||||
context.setDepthMode(paintParameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly));
|
||||
context.setStencilMode(gl::StencilMode::disabled());
|
||||
context.setColorMode(paintParameters.colorModeForRenderPass());
|
||||
glContext.bindVertexArray = 0;
|
||||
glContext.setDepthMode(paintParameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly));
|
||||
glContext.setStencilMode(gl::StencilMode::disabled());
|
||||
glContext.setColorMode(paintParameters.colorModeForRenderPass());
|
||||
|
||||
CustomLayerRenderParameters parameters;
|
||||
|
||||
@@ -70,12 +75,12 @@ void RenderCustomLayer::render(PaintParameters& paintParameters, RenderSource*)
|
||||
parameters.fieldOfView = state.getFieldOfView();
|
||||
|
||||
assert(impl().renderFn);
|
||||
impl().renderFn(impl().context, parameters);
|
||||
impl().renderFn(context, parameters);
|
||||
|
||||
// Reset the view back to our original one, just in case the CustomLayer changed
|
||||
// the viewport or Framebuffer.
|
||||
paintParameters.backend.bind();
|
||||
context.setDirtyState();
|
||||
glContext.setDirtyState();
|
||||
}
|
||||
|
||||
} // namespace mbgl
|
||||
|
||||
@@ -26,6 +26,7 @@ public:
|
||||
private:
|
||||
bool initialized = false;
|
||||
bool contextDestroyed = false;
|
||||
void * context = nullptr;
|
||||
};
|
||||
|
||||
template <>
|
||||
|
||||
Reference in New Issue
Block a user