diff options
| author | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-26 17:46:27 +0100 |
|---|---|---|
| committer | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-26 17:46:27 +0100 |
| commit | 940886f9fa9e9d4238daa77e38a3a066187d66a5 (patch) | |
| tree | 1cafa9803c986a2cc91e7e3108b07b2b37b803a4 /ice40/gfx.cc | |
| parent | 340c2520b009e8a84b0f8e4bdbce91daad74f367 (diff) | |
| parent | ae6eeb9d810c647ca1684459627b8dd20870f993 (diff) | |
| download | nextpnr-940886f9fa9e9d4238daa77e38a3a066187d66a5.tar.gz nextpnr-940886f9fa9e9d4238daa77e38a3a066187d66a5.tar.bz2 nextpnr-940886f9fa9e9d4238daa77e38a3a066187d66a5.zip | |
Merge branch 'master' into q3k/clickity
Diffstat (limited to 'ice40/gfx.cc')
| -rw-r--r-- | ice40/gfx.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ice40/gfx.cc b/ice40/gfx.cc index 0a583e8e..0798862a 100644 --- a/ice40/gfx.cc +++ b/ice40/gfx.cc @@ -24,7 +24,7 @@ NEXTPNR_NAMESPACE_BEGIN void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id, GraphicElement::style_t style) { GraphicElement el; - el.type = GraphicElement::G_LINE; + el.type = GraphicElement::TYPE_LINE; el.style = style; // Horizontal Span-4 Wires @@ -647,7 +647,7 @@ void pipGfx(std::vector<GraphicElement> &g, int x, int y, float x1, float y1, fl float ty = 0.5 * (y1 + y2); GraphicElement el; - el.type = GraphicElement::G_ARROW; + el.type = GraphicElement::TYPE_ARROW; el.style = style; if (fabsf(x1 - swx1) < 0.001 && fabsf(x2 - swx1) < 0.001) { @@ -704,7 +704,7 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId src, if (src == TILE_WIRE_CARRY_IN && dst == TILE_WIRE_CARRY_IN_MUX) { GraphicElement el; - el.type = GraphicElement::G_ARROW; + el.type = GraphicElement::TYPE_ARROW; el.style = style; el.x1 = x + logic_cell_x1 + 0.005 * 3; el.x2 = el.x1; |