tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use std::optional instead of mbgl::optional (#911)

Browse Source
This commit is contained in:
Bart Louwers
2023-03-17 12:51:59 +01:00
committed by GitHub
parent 36846439c6
commit 15ad65dd3d
482 changed files with 2605 additions and 2652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mbgl/renderer/render_layer.cpp
View File

@@ -52,8 +52,8 @@ void RenderLayer::prepare(const LayerPrepareParameters& params) {
addRenderPassesFromTiles();
}
optional<Color> RenderLayer::getSolidBackground() const {
return nullopt;
std::optional<Color> RenderLayer::getSolidBackground() const {
return std::nullopt;
}
void RenderLayer::markContextDestroyed() {
@@ -69,20 +69,18 @@ void RenderLayer::checkRenderability(const PaintParameters& parameters,
if (activeBindingCount > parameters.context.maximumVertexBindingCount) {
Log::Error(Event::OpenGL,
"The layer '%s' uses more data-driven properties than the current device "
"The layer '" + getID() + "' uses more data-driven properties than the current device "
"supports, and will have rendering errors. To ensure compatibility with this "
"device, use %d fewer data driven properties in this layer.",
getID().c_str(),
activeBindingCount - gfx::Context::minimumRequiredVertexBindingCount);
"device, use " + std::to_string(activeBindingCount - gfx::Context::minimumRequiredVertexBindingCount) +
" fewer data driven properties in this layer.");
hasRenderFailures = true;
} else if (activeBindingCount > gfx::Context::minimumRequiredVertexBindingCount) {
Log::Warning(Event::OpenGL,
"The layer '%s' uses more data-driven properties than some devices may support. "
"The layer '" + getID() + "' uses more data-driven properties than some devices may support. "
"Though it will render correctly on this device, it may have rendering errors "
"on other devices. To ensure compatibility with all devices, use %d fewer "
"data-driven properties in this layer.",
getID().c_str(),
activeBindingCount - gfx::Context::minimumRequiredVertexBindingCount);
"on other devices. To ensure compatibility with all devices, use " +
std::to_string(activeBindingCount - gfx::Context::minimumRequiredVertexBindingCount) + "fewer "
"data-driven properties in this layer.");
hasRenderFailures = true;
}
}