Merge branch 'ice40gfx' into 'master'

Ice40gfx

See merge request SymbioticEDA/nextpnr!7

1 files changed, 60 insertions, 0 deletions

diff --git a/common/nextpnr.h b/common/nextpnr.h
index 37e193b9..0b41ff81 100644
--- a/common/nextpnr.h
+++ b/common/nextpnr.h
@@ -155,6 +155,12 @@ NEXTPNR_NAMESPACE_END
 
 NEXTPNR_NAMESPACE_BEGIN
 
+struct DecalXY
+{
+    DecalId decal;
+    float x = 0, y = 0;
+};
+
 struct BelPin
 {
     BelId bel;
@@ -273,6 +279,60 @@ struct Context : Arch
 
     // --------------------------------------------------------------
 
+    std::vector<GraphicElement> getFrameGraphics() const __attribute__ ((deprecated)) {
+        std::vector<GraphicElement> ret;
+        DecalXY decalxy = getFrameDecal();
+        ret = getDecalGraphics(decalxy.decal);
+        for (auto &it : ret) {
+            it.x1 += decalxy.x;
+            it.x2 += decalxy.x;
+            it.y1 += decalxy.y;
+            it.y2 += decalxy.y;
+        }
+        return ret;
+    }
+
+    std::vector<GraphicElement> getBelGraphics(BelId bel) const __attribute__ ((deprecated)) {
+        std::vector<GraphicElement> ret;
+        DecalXY decalxy = getBelDecal(bel);
+        ret = getDecalGraphics(decalxy.decal);
+        for (auto &it : ret) {
+            it.x1 += decalxy.x;
+            it.x2 += decalxy.x;
+            it.y1 += decalxy.y;
+            it.y2 += decalxy.y;
+        }
+        return ret;
+    }
+
+    std::vector<GraphicElement> getWireGraphics(WireId wire) const __attribute__ ((deprecated)) {
+        std::vector<GraphicElement> ret;
+        DecalXY decalxy = getWireDecal(wire);
+        ret = getDecalGraphics(decalxy.decal);
+        for (auto &it : ret) {
+            it.x1 += decalxy.x;
+            it.x2 += decalxy.x;
+            it.y1 += decalxy.y;
+            it.y2 += decalxy.y;
+        }
+        return ret;
+    }
+
+    std::vector<GraphicElement> getPipGraphics(PipId pip) const __attribute__ ((deprecated)) {
+        std::vector<GraphicElement> ret;
+        DecalXY decalxy = getPipDecal(pip);
+        ret = getDecalGraphics(decalxy.decal);
+        for (auto &it : ret) {
+            it.x1 += decalxy.x;
+            it.x2 += decalxy.x;
+            it.y1 += decalxy.y;
+            it.y2 += decalxy.y;
+        }
+        return ret;
+    }
+
+    // --------------------------------------------------------------
+
     uint64_t rngstate = 0x3141592653589793;
 
     uint64_t rng64()