diff options
Diffstat (limited to 'src/mbgl/renderer/paint_parameters.cpp')
| -rw-r--r-- | src/mbgl/renderer/paint_parameters.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/mbgl/renderer/paint_parameters.cpp b/src/mbgl/renderer/paint_parameters.cpp index beaa9d34f2..ce538b2683 100644 --- a/src/mbgl/renderer/paint_parameters.cpp +++ b/src/mbgl/renderer/paint_parameters.cpp @@ -26,7 +26,7 @@ PaintParameters::PaintParameters(gl::Context& context_, debugOptions(updateParameters.debugOptions), contextMode(contextMode_), timePoint(updateParameters.timePoint), - symbolFadeChange(updateParameters.mode == MapMode::Still ? 1 : std::chrono::duration<float>(placementCommitTime - updateParameters.timePoint) / Duration(std::chrono::milliseconds(300))), // TODO don't hardcode + symbolFadeChange((true || updateParameters.mode == MapMode::Still) ? 1 : std::chrono::duration<float>(placementCommitTime - updateParameters.timePoint) / Duration(std::chrono::milliseconds(300))), // TODO don't hardcode pixelRatio(pixelRatio_), #ifndef NDEBUG programs((debugOptions & MapDebugOptions::Overdraw) ? staticData_.overdrawPrograms : staticData_.programs) @@ -66,15 +66,16 @@ gl::DepthMode PaintParameters::depthModeFor3D(gl::DepthMode::Mask mask) const { return gl::DepthMode { gl::DepthMode::LessEqual, mask, { 0.0, 1.0 } }; } -gl::StencilMode PaintParameters::stencilModeForClipping(const ClipID& id) const { - return gl::StencilMode { - gl::StencilMode::Equal { static_cast<uint32_t>(id.mask.to_ulong()) }, - static_cast<int32_t>(id.reference.to_ulong()), - 0, - gl::StencilMode::Keep, - gl::StencilMode::Keep, - gl::StencilMode::Replace - }; +gl::StencilMode PaintParameters::stencilModeForClipping(const ClipID& ) const { + return gl::StencilMode::disabled(); +// return gl::StencilMode { +// gl::StencilMode::Equal { static_cast<uint32_t>(id.mask.to_ulong()) }, +// static_cast<int32_t>(id.reference.to_ulong()), +// 0, +// gl::StencilMode::Keep, +// gl::StencilMode::Keep, +// gl::StencilMode::Replace +// }; } gl::ColorMode PaintParameters::colorModeForRenderPass() const { |