diff --git a/include/mbgl/mtl/renderer_backend.hpp b/include/mbgl/mtl/renderer_backend.hpp index b519bb69d..fe7abb18b 100644 --- a/include/mbgl/mtl/renderer_backend.hpp +++ b/include/mbgl/mtl/renderer_backend.hpp @@ -32,6 +32,7 @@ public: const MTLDevicePtr& getDevice() const { return device; } const MTLCommandQueuePtr& getCommandQueue() const { return commandQueue; } + const bool isBaseVertexInstanceDrawingSupported() const { return baseVertexInstanceDrawingSupported; } protected: std::unique_ptr createContext() override; @@ -61,6 +62,7 @@ public: protected: MTLDevicePtr device; MTLCommandQueuePtr commandQueue; + bool baseVertexInstanceDrawingSupported = false; }; } // namespace mtl diff --git a/src/mbgl/mtl/context.cpp b/src/mbgl/mtl/context.cpp index b6470ec13..3e8d5389d 100644 --- a/src/mbgl/mtl/context.cpp +++ b/src/mbgl/mtl/context.cpp @@ -416,9 +416,7 @@ bool Context::renderTileClippingMasks(gfx::RenderPass& renderPass, MTL::IndexType::IndexTypeUInt16, indexRes->getMetalBuffer().get(), /*indexOffset=*/0, - /*instanceCount=*/static_cast(tileUBOs.size()), - /*baseVertex=*/0, - /*baseInstance=*/0); + /*instanceCount=*/static_cast(tileUBOs.size())); #else const auto uboIndex = ShaderClass::uniforms[0].index; for (std::size_t ii = 0; ii < tileUBOs.size(); ++ii) { @@ -429,9 +427,7 @@ bool Context::renderTileClippingMasks(gfx::RenderPass& renderPass, MTL::IndexType::IndexTypeUInt16, indexRes->getMetalBuffer().get(), /*indexOffset=*/0, - /*instanceCount=*/1, - /*baseVertex=*/0, - /*baseInstance=*/0); + /*instanceCount=*/1); } #endif diff --git a/src/mbgl/mtl/drawable.cpp b/src/mbgl/mtl/drawable.cpp index 71b06bd03..a3bc354b2 100644 --- a/src/mbgl/mtl/drawable.cpp +++ b/src/mbgl/mtl/drawable.cpp @@ -292,14 +292,20 @@ void Drawable::draw(PaintParameters& parameters) const { assert(static_cast(maxIndex) < mlSegment.vertexLength); #endif - encoder->drawIndexedPrimitives(primitiveType, - mlSegment.indexLength, - indexType, - indexBuffer, - indexOffset, - instanceCount, - baseVertex, - baseInstance); + if (context.getBackend().isBaseVertexInstanceDrawingSupported()) { + encoder->drawIndexedPrimitives(primitiveType, + mlSegment.indexLength, + indexType, + indexBuffer, + indexOffset, + instanceCount, + baseVertex, + baseInstance); + } else { + encoder->drawIndexedPrimitives( + primitiveType, mlSegment.indexLength, indexType, indexBuffer, indexOffset, instanceCount); + } + context.renderingStats().numDrawCalls++; } } diff --git a/src/mbgl/mtl/renderer_backend.cpp b/src/mbgl/mtl/renderer_backend.cpp index 6af61d9dc..7f8a1fdf2 100644 --- a/src/mbgl/mtl/renderer_backend.cpp +++ b/src/mbgl/mtl/renderer_backend.cpp @@ -46,6 +46,7 @@ RendererBackend::RendererBackend(const gfx::ContextMode contextMode_) commandQueue(NS::TransferPtr(device->newCommandQueue())) { assert(device); assert(commandQueue); + baseVertexInstanceDrawingSupported = device->supportsFamily(MTL::GPUFamilyApple3); } RendererBackend::~RendererBackend() = default;