Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Metal base vertex instance drawing disabled on GPUFamilyApple2 devices #2470

Merged
merged 10 commits into from
Jun 5, 2024
Merged

Metal base vertex instance drawing disabled on GPUFamilyApple2 devices #2470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
14bf8d8
Metal instance drawing made optional.
alexcristici Jun 4, 2024
bbed14e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 4, 2024
871e829
Merge branch 'main' into metal-instance-drawing-made-optional
alexcristici Jun 4, 2024
7fad377
Disabled instance drawing on GPUFamilyApple2 devices.
alexcristici Jun 4, 2024
824b15f
Merge branch 'metal-instance-drawing-made-optional' of https://github…
alexcristici Jun 4, 2024
8226e77
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 4, 2024
5895c2a
Cached if instance drawing is supported.
alexcristici Jun 4, 2024
d906ce8
Instance drawing is supported, but not base vertex instance drawing.
alexcristici Jun 4, 2024
e475d42
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 4, 2024
85d7044
Merge branch 'main' into metal-instance-drawing-made-optional
alexcristici Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/mbgl/mtl/renderer_backend.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class RendererBackend : public gfx::RendererBackend {

const MTLDevicePtr& getDevice() const { return device; }
const MTLCommandQueuePtr& getCommandQueue() const { return commandQueue; }
const bool isBaseVertexInstanceDrawingSupported() const { return baseVertexInstanceDrawingSupported; }

protected:
std::unique_ptr<gfx::Context> createContext() override;
Expand Down Expand Up @@ -61,6 +62,7 @@ class RendererBackend : public gfx::RendererBackend {
protected:
MTLDevicePtr device;
MTLCommandQueuePtr commandQueue;
bool baseVertexInstanceDrawingSupported = false;
};

} // namespace mtl
Expand Down
8 changes: 2 additions & 6 deletions src/mbgl/mtl/context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,7 @@ bool Context::renderTileClippingMasks(gfx::RenderPass& renderPass,
MTL::IndexType::IndexTypeUInt16,
indexRes->getMetalBuffer().get(),
/*indexOffset=*/0,
/*instanceCount=*/static_cast<NS::UInteger>(tileUBOs.size()),
/*baseVertex=*/0,
/*baseInstance=*/0);
/*instanceCount=*/static_cast<NS::UInteger>(tileUBOs.size()));
#else
const auto uboIndex = ShaderClass::uniforms[0].index;
for (std::size_t ii = 0; ii < tileUBOs.size(); ++ii) {
Expand All @@ -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

Expand Down
22 changes: 14 additions & 8 deletions src/mbgl/mtl/drawable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,14 +292,20 @@ void Drawable::draw(PaintParameters& parameters) const {
assert(static_cast<std::size_t>(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++;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/mbgl/mtl/renderer_backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading