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

FillBucket::triangles could be empty: skip creating buffer and draw. (#14761)

Browse Source
This commit is contained in:
Aleksandar Stojiljkovic
2019-05-24 17:46:57 +03:00
committed by GitHub
parent 1bef3b7d1d
commit 788d54b2b4
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mbgl/renderer/buckets/fill_bucket.cpp
View File

@@ -124,7 +124,7 @@ void FillBucket::addFeature(const GeometryTileFeature& feature,
void FillBucket::upload(gfx::UploadPass& uploadPass) {
vertexBuffer = uploadPass.createVertexBuffer(std::move(vertices));
lineIndexBuffer = uploadPass.createIndexBuffer(std::move(lines));
triangleIndexBuffer = uploadPass.createIndexBuffer(std::move(triangles));
triangleIndexBuffer = triangles.empty() ? optional<gfx::IndexBuffer> {} : uploadPass.createIndexBuffer(std::move(triangles));
for (auto& pair : paintPropertyBinders) {
pair.second.upload(uploadPass);

24
src/mbgl/renderer/layers/render_fill_layer.cpp
View File

@@ -131,8 +131,9 @@ void RenderFillLayer::render(PaintParameters& parameters) {
// Only draw the fill when it's opaque and we're drawing opaque fragments,
// or when it's translucent and we're drawing translucent fragments.
if ((evaluated.get<FillColor>().constantOr(Color()).a >= 1.0f
&& evaluated.get<FillOpacity>().constantOr(0) >= 1.0f) == (parameters.pass == RenderPass::Opaque)) {
if (bucket.triangleIndexBuffer &&
(evaluated.get<FillColor>().constantOr(Color()).a >= 1.0f &&
evaluated.get<FillOpacity>().constantOr(0) >= 1.0f) == (parameters.pass == RenderPass::Opaque)) {
draw(parameters.programs.getFillLayerPrograms().fill,
gfx::Triangles(),
parameters.depthModeForSublayer(1, parameters.pass == RenderPass::Opaque
@@ -225,15 +226,16 @@ void RenderFillLayer::render(PaintParameters& parameters) {
);
};
draw(parameters.programs.getFillLayerPrograms().fillPattern,
gfx::Triangles(),
parameters.depthModeForSublayer(1, gfx::DepthMaskType::ReadWrite),
*bucket.triangleIndexBuffer,
bucket.triangleSegments,
FillPatternProgram::TextureBindings{
textures::image::Value{ geometryTile.iconAtlasTexture->getResource(), gfx::TextureFilterType::Linear },
});
if (bucket.triangleIndexBuffer) {
draw(parameters.programs.getFillLayerPrograms().fillPattern,
gfx::Triangles(),
parameters.depthModeForSublayer(1, gfx::DepthMaskType::ReadWrite),
*bucket.triangleIndexBuffer,
bucket.triangleSegments,
FillPatternProgram::TextureBindings{
textures::image::Value{ geometryTile.iconAtlasTexture->getResource(), gfx::TextureFilterType::Linear },
});
}
if (evaluated.get<FillAntialias>() && unevaluated.get<FillOutlineColor>().isUndefined()) {
draw(parameters.programs.getFillLayerPrograms().fillOutlinePattern,
gfx::Lines { 2.0f },