From 4bbb80e31af4c5626d118995e36ade470935fafe Mon Sep 17 00:00:00 2001
From: warriorofwire <3454741+WarriorOfWire@users.noreply.github.com>
Date: Tue, 12 May 2020 21:55:18 -0700
Subject: vectorio: speed up polygon

This change takes polygon from 126k pixels per second fill to 240k pps fill
  on a reference 5 point star 50x66px polygon, updating both location and shape
  at 10hz.  Tested on an m4 express feather.

As a curiosity, the flat-out fill rate of a shape whose get_pixel is `return 0;`
  fills just shy of 375k pixels per second.
---
 shared-bindings/vectorio/Polygon.c | 42 ++------------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

(limited to 'shared-bindings')

diff --git a/shared-bindings/vectorio/Polygon.c b/shared-bindings/vectorio/Polygon.c
index 5f4d85e21..e9e90942a 100644
--- a/shared-bindings/vectorio/Polygon.c
+++ b/shared-bindings/vectorio/Polygon.c
@@ -15,41 +15,6 @@
 // #define VECTORIO_POLYGON_DEBUG(...) mp_printf(&mp_plat_print __VA_OPT__(,) __VA_ARGS__)
 
 
-// Converts a list of points tuples to a flat list of ints for speedier internal use.
-// Also validates the points.
-static mp_obj_t _to_points_list(mp_obj_t points_tuple_list) {
-    size_t len = 0;
-    mp_obj_t *items;
-    mp_obj_list_get(points_tuple_list, &len, &items);
-    VECTORIO_POLYGON_DEBUG("polygon_points_list len: %d\n", len);
-
-    if ( len == 0 ) {
-        mp_raise_TypeError_varg(translate("empty %q list"), MP_QSTR_point);
-    }
-
-    mp_obj_t points_list = mp_obj_new_list(0, NULL);
-
-    for ( size_t i = 0; i < len; ++i) {
-        size_t tuple_len = 0;
-        mp_obj_t *tuple_items;
-        mp_obj_tuple_get(items[i], &tuple_len, &tuple_items);
-
-        if (tuple_len != 2) {
-            mp_raise_ValueError_varg(translate("%q must be a tuple of length 2"), MP_QSTR_point);
-        }
-        int value;
-        if (!mp_obj_get_int_maybe(tuple_items[0], &value)) {
-            mp_raise_ValueError_varg(translate("unsupported %q type"), MP_QSTR_point);
-        }
-        mp_obj_list_append(points_list, MP_OBJ_NEW_SMALL_INT(value));
-        if (!mp_obj_get_int_maybe(tuple_items[1], &value)) {
-            mp_raise_ValueError_varg(translate("unsupported %q type"), MP_QSTR_point);
-        }
-        mp_obj_list_append(points_list, MP_OBJ_NEW_SMALL_INT(value));
-    }
-    return points_list;
-}
-//| from typing import List, Tuple
 //|
 //| class Polygon:
 //|     def __init__(self, points: List[ Tuple[ x, y ], ... ] ):
@@ -68,12 +33,11 @@ static mp_obj_t vectorio_polygon_make_new(const mp_obj_type_t *type, size_t n_ar
     if (!MP_OBJ_IS_TYPE(args[ARG_points_list].u_obj, &mp_type_list)) {
         mp_raise_TypeError_varg(translate("%q list must be a list"), MP_QSTR_point);
     }
-    mp_obj_t points_list = _to_points_list(args[ARG_points_list].u_obj);
 
     vectorio_polygon_t *self = m_new_obj(vectorio_polygon_t);
     self->base.type = &vectorio_polygon_type;
 
-    common_hal_vectorio_polygon_construct(self, points_list);
+    common_hal_vectorio_polygon_construct(self, args[ARG_points_list].u_obj);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -104,9 +68,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(vectorio_polygon_get_points_obj, vectorio_polygon_obj_
 STATIC mp_obj_t vectorio_polygon_obj_set_points(mp_obj_t self_in, mp_obj_t points) {
     vectorio_polygon_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_obj_t points_list = _to_points_list(points);
-
-    common_hal_vectorio_polygon_set_points(self, points_list);
+    common_hal_vectorio_polygon_set_points(self, points);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(vectorio_polygon_set_points_obj, vectorio_polygon_obj_set_points);
-- 
cgit v1.2.3


From dde66cadde44e478d7b11358f768b1debc0b03c7 Mon Sep 17 00:00:00 2001
From: warriorofwire <3454741+WarriorOfWire@users.noreply.github.com>
Date: Thu, 14 May 2020 11:44:36 -0700
Subject: remove a duplication in polygon.c

---
 shared-bindings/vectorio/Polygon.c |  1 +
 shared-module/vectorio/Polygon.c   | 10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'shared-bindings')

diff --git a/shared-bindings/vectorio/Polygon.c b/shared-bindings/vectorio/Polygon.c
index e9e90942a..01045d098 100644
--- a/shared-bindings/vectorio/Polygon.c
+++ b/shared-bindings/vectorio/Polygon.c
@@ -15,6 +15,7 @@
 // #define VECTORIO_POLYGON_DEBUG(...) mp_printf(&mp_plat_print __VA_OPT__(,) __VA_ARGS__)
 
 
+//| from typing import List, Tuple
 //|
 //| class Polygon:
 //|     def __init__(self, points: List[ Tuple[ x, y ], ... ] ):
diff --git a/shared-module/vectorio/Polygon.c b/shared-module/vectorio/Polygon.c
index 7e3a3acfe..aadf47911 100644
--- a/shared-module/vectorio/Polygon.c
+++ b/shared-module/vectorio/Polygon.c
@@ -42,13 +42,9 @@ static void _clobber_points_list(vectorio_polygon_t *self, mp_obj_t points_tuple
         if (tuple_len != 2) {
             mp_raise_ValueError_varg(translate("%q must be a tuple of length 2"), MP_QSTR_point);
         }
-        if (!mp_obj_get_int_maybe(tuple_items[0], &self->points_list[2*i])) {
-            self->len = 0;
-            gc_free( self->points_list );
-            self->points_list = NULL;
-            mp_raise_ValueError_varg(translate("unsupported %q type"), MP_QSTR_point);
-        }
-        if (!mp_obj_get_int_maybe(tuple_items[1], &self->points_list[2*i + 1])) {
+        if (   !mp_obj_get_int_maybe(tuple_items[ 0 ], &self->points_list[2*i    ])
+            || !mp_obj_get_int_maybe(tuple_items[ 1 ], &self->points_list[2*i + 1])
+        ) {
             self->len = 0;
             gc_free( self->points_list );
             self->points_list = NULL;
-- 
cgit v1.2.3