diff --git a/src/mbgl/gfx/attribute.hpp b/src/mbgl/gfx/attribute.hpp index db84f8b00..ddcace025 100644 --- a/src/mbgl/gfx/attribute.hpp +++ b/src/mbgl/gfx/attribute.hpp @@ -98,7 +98,7 @@ public: struct AttributeDescriptor { AttributeDataType dataType; - uint8_t offset; + uint32_t offset; }; inline bool operator==(const AttributeDescriptor& lhs, const AttributeDescriptor& rhs) { diff --git a/src/mbgl/gfx/drawable_builder.cpp b/src/mbgl/gfx/drawable_builder.cpp index 006ef966a..f92976e0c 100644 --- a/src/mbgl/gfx/drawable_builder.cpp +++ b/src/mbgl/gfx/drawable_builder.cpp @@ -106,12 +106,18 @@ void DrawableBuilder::addTriangles(const std::vector>& ve // std::next(indexes.begin(), indexOffset), // std::next(indexes.begin(), indexOffset + indexLength)); + const auto baseIndex = impl->vertices.elements(); std::for_each(std::next(vertices.begin(), vertexOffset), std::next(vertices.begin(), vertexOffset + vertexLength), [&](const std::array& x) { impl->vertices.emplace_back(Impl::VT({{x}})); }); for (auto i = std::next(indexes.begin(), indexOffset); i != std::next(indexes.begin(), indexOffset + indexLength);) { - impl->indexes.emplace_back(*i++, *i++, *i++); + impl->indexes.emplace_back(*i++ + baseIndex, *i++ + baseIndex, *i++ + baseIndex); + } + if (colorMode == ColorMode::PerVertex) { + for (size_t i = 0; i < vertexLength; ++i) { + impl->colors.emplace_back(impl->currentColor); + } } } diff --git a/src/mbgl/gl/upload_pass.cpp b/src/mbgl/gl/upload_pass.cpp index cf4ef60ce..2c6089460 100644 --- a/src/mbgl/gl/upload_pass.cpp +++ b/src/mbgl/gl/upload_pass.cpp @@ -155,7 +155,7 @@ gfx::AttributeBindingArray UploadPass::buildAttributeBindings( const auto& effectiveGL = static_cast(effectiveAttr); const auto& defaultGL = static_cast(defaultAttr); const auto stride = defaultAttr.getStride(); - const auto offset = static_cast(allData.size()); + const auto offset = static_cast(allData.size()); // Get the raw data for the values in the desired format const auto& rawData = effectiveGL.getRaw(defaultGL.getGLType()); diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index e6b53d1f6..85713a3f1 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -263,8 +263,6 @@ bool RenderFillLayer::queryIntersectsFeature(const GeometryCoordinates& queryGeo constexpr auto shaderName = "background_generic"; void RenderFillLayer::layerRemoved(UniqueChangeRequestVec& changes) { - // TODO: This isn't happening on style change, so old tile drawables are being left active - // Remove everything decltype(tileDrawables) localDrawables; { @@ -344,49 +342,6 @@ void RenderFillLayer::update(const int32_t layerIndex, // drawable->setLayerIndex(layerIndex); // } // } - // - // std::unique_ptr builder; - // - // // For each tile in the cover set, add a tile drawable if one doesn't already exist. - // // We currently assume only one drawable per tile. - // for (const auto& tileID : tileCover) { - // const auto result = tileDrawables.insert(std::make_pair(tileID, gfx::DrawablePtr())); - // if (!result.second) { - // // Already present - // // TODO: Update matrix here or in the tweaker? - // continue; - // } - // - // // We actually need to build things, so set up a builder if we haven't already - // if (!builder) { - // builder = context.createDrawableBuilder("background"); - // builder->setShader(shader); - // builder->addTweaker(context.createDrawableTweaker()); - // builder->setColor(*color); - // builder->setColorMode(gfx::DrawableBuilder::ColorMode::PerDrawable); - // builder->setDepthType(gfx::DepthMaskType::ReadWrite); - // builder->setLayerIndex(layerIndex); - // } - // - // // Tile coordinates are fixed... - // builder->addQuad(0, 0, util::EXTENT, util::EXTENT); - // - // // ... they're placed with the matrix in the uniforms, which changes with the view - // builder->setMatrix(/*parameters.matrixForTile(tileID.toUnwrapped())*/ matrix::identity4()); - // - // builder->flush(); - // - // auto drawables = builder->clearDrawables(); - // if (!drawables.empty()) { - // auto& drawable = drawables[0]; - // drawable->setTileID(tileID); - // result.first->second = drawable; - // changes.emplace_back(std::make_unique(std::move(drawable))); - // ++stats.tileDrawablesAdded; - // // Log::Warning(Event::General, "Adding drawable for " + util::toString(tileID) + " total " + - // // std::to_string(stats.tileDrawablesAdded+1)); - // } - // } std::unordered_set newTileIDs(renderTiles->size()); std::transform(renderTiles->begin(), @@ -450,16 +405,21 @@ void RenderFillLayer::update(const int32_t layerIndex, builder = context.createDrawableBuilder("fill"); builder->setShader(shader); builder->addTweaker(context.createDrawableTweaker()); - builder->setColorMode(gfx::DrawableBuilder::ColorMode::PerDrawable); + builder->setColorMode(gfx::DrawableBuilder::ColorMode::PerVertex); builder->setDepthType(gfx::DepthMaskType::ReadWrite); builder->setLayerIndex(layerIndex); } - const auto fillRenderPass = (evaluated.get().constantOr(Color()).a >= 1.0f && - evaluated.get().constantOr(0) >= 1.0f + // tile.translatedMatrix(evaluated.get(), evaluated.get(), parameters.state) + + const auto evalColor = evaluated.get().constantOr(Color()); + const auto fillOpacity = evaluated.get().constantOr(0); + const auto fillColor = evalColor * (fillOpacity > 0.0f ? fillOpacity : 1.0f); + builder->setColor(fillColor); + + const auto fillRenderPass = (evalColor.a >= 1.0f && fillOpacity >= 1.0f /* && parameters.currentLayer >= parameters.opaquePassCutoff*/) - ? RenderPass::Opaque - : RenderPass::Translucent; + ? RenderPass::Opaque : RenderPass::Translucent; builder->setRenderPass(fillRenderPass); const std::vector>>::Vertex>&