diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2019-10-20 09:38:08 +0200 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2019-10-20 09:41:48 +0200 |
| commit | e9ae0cf7ce664f03b1810dbe21fa82100c7b58c3 (patch) | |
| tree | 6da268ba26f93f4c97b66675b68a0692e3116b1f | |
| parent | eaf760768b0515ea0b3d9b694daa6ed480d0da9e (diff) | |
| download | nextpnr-e9ae0cf7ce664f03b1810dbe21fa82100c7b58c3.tar.gz nextpnr-e9ae0cf7ce664f03b1810dbe21fa82100c7b58c3.tar.bz2 nextpnr-e9ae0cf7ce664f03b1810dbe21fa82100c7b58c3.zip | |
muxes only together with slices
| -rw-r--r-- | ecp5/arch.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index d111e923..9e5c4a14 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -639,15 +639,6 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const el.y1 = y + switchbox_y1; el.y2 = y + switchbox_y2; ret.push_back(el); - - for(int i=0;i<4;i++) - { - el.x1 = x + slice_x2 + 0.0255f; - el.x2 = el.x1 + 0.0017f; - el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CLK3_SLICE - TILE_WIRE_DUMMY_D2 + 5 + i*26) + 3*slice_pitch - 0.0007f; - el.y2 = el.y1 + 0.0017f * 5; - ret.push_back(el); - } } } if (decal.type == DecalId::TYPE_WIRE) { @@ -924,6 +915,13 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const el.y1 = y + slice_y1 + (z)*slice_pitch; el.y2 = y + slice_y2 + (z)*slice_pitch; ret.push_back(el); + + el.style = GraphicElement::STYLE_FRAME; + el.x1 = x + slice_x2 + 0.0255f; + el.x2 = el.x1 + 0.0017f; + el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CLK3_SLICE - TILE_WIRE_DUMMY_D2 + 5 + z*26) + 3*slice_pitch - 0.0007f; + el.y2 = el.y1 + 0.0017f * 5; + ret.push_back(el); } if (bel_type == id_TRELLIS_IO) { |