diff options
| author | gatecat <gatecat@ds0.me> | 2021-02-12 10:35:51 +0000 |
|---|---|---|
| committer | gatecat <gatecat@ds0.me> | 2021-02-12 10:35:51 +0000 |
| commit | c956cae8244c094783edc7101fd0ca542c24e55b (patch) | |
| tree | a246fd235d57000f14d89d4283a91c218cb66b81 | |
| parent | ad7bb510303e2a3b03bb4a043e62f10a4a0498b2 (diff) | |
| download | nextpnr-c956cae8244c094783edc7101fd0ca542c24e55b.tar.gz nextpnr-c956cae8244c094783edc7101fd0ca542c24e55b.tar.bz2 nextpnr-c956cae8244c094783edc7101fd0ca542c24e55b.zip | |
Make BaseArch getDecalGraphics return an empty range
Fix assertion failure when opening the GUI on an arch without any
decals.
Signed-off-by: gatecat <gatecat@ds0.me>
| -rw-r--r-- | common/nextpnr.h | 2 | ||||
| -rw-r--r-- | docs/archapi.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/nextpnr.h b/common/nextpnr.h index 26dcaac4..8d6ab4cc 100644 --- a/common/nextpnr.h +++ b/common/nextpnr.h @@ -1375,7 +1375,7 @@ template <typename R> struct BaseArch : ArchAPI<R> // Decal methods virtual typename R::DecalGfxRangeT getDecalGraphics(DecalId decal) const override { - NPNR_ASSERT_FALSE("unreachable"); + return empty_if_possible<typename R::DecalGfxRangeT>(); }; virtual DecalXY getBelDecal(BelId bel) const override { return DecalXY(); } virtual DecalXY getWireDecal(WireId wire) const override { return DecalXY(); } diff --git a/docs/archapi.md b/docs/archapi.md index 3535122e..df7cd0a1 100644 --- a/docs/archapi.md +++ b/docs/archapi.md @@ -573,7 +573,7 @@ Return the graphic elements that make up a decal. The same decal must always produce the same list. If the graphics for a design element changes, that element must return another decal. -*BaseArch default: asserts false as unreachable due to there being no decals* +*BaseArch default: returns default-constructed range* ### DecalXY getBelDecal(BelId bel) const |