diff --git a/himbaechel/arch.cc b/himbaechel/arch.cc index 8da731f3c8..dccf285e29 100644 --- a/himbaechel/arch.cc +++ b/himbaechel/arch.cc @@ -525,7 +525,7 @@ std::vector Arch::getDecalGraphics(DecalId decal) const GroupId group(decal.tile, decal.index); Loc loc; tile_xy(chip_info, decal.tile, loc.x, loc.y); - uarch->drawGroup(ret, getGroupType(group), loc); + uarch->drawGroup(ret, group, loc); } else if (decal.type == DecalId::TYPE_BEL) { BelId bel(decal.tile, decal.index); GraphicElement::style_t style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE; diff --git a/himbaechel/himbaechel_api.h b/himbaechel/himbaechel_api.h index f64c138c6d..4f6f210130 100644 --- a/himbaechel/himbaechel_api.h +++ b/himbaechel/himbaechel_api.h @@ -115,7 +115,7 @@ struct HimbaechelAPI virtual void drawPip(std::vector &g, GraphicElement::style_t style, Loc loc, WireId src, IdString src_type, int32_t src_id, WireId dst, IdString dst_type, int32_t dst_id) {}; - virtual void drawGroup(std::vector &g, IdString group_type, Loc loc) {}; + virtual void drawGroup(std::vector &g, GroupId group, Loc loc) {}; // Routing methods virtual void expandBoundingBox(BoundingBox &bb) const; diff --git a/himbaechel/uarch/example/example.cc b/himbaechel/uarch/example/example.cc index 6a51fc464c..cfb2a0b933 100644 --- a/himbaechel/uarch/example/example.cc +++ b/himbaechel/uarch/example/example.cc @@ -139,8 +139,9 @@ struct ExampleImpl : HimbaechelAPI return true; } - void drawGroup(std::vector &g, IdString group_type, Loc loc) override + void drawGroup(std::vector &g, GroupId group, Loc loc) override { + IdString group_type = ctx->getGroupType(group); if (group_type == id_SWITCHBOX) { GraphicElement el; el.type = GraphicElement::TYPE_BOX;