made <graphy.h> consistent with <graphx.h>

Author: ZERICO2005

src/graphy/graphy.h

@@ -612,23 +612,6 @@ gfy_ConvertToNewRLETSprite(sprite_in, malloc)
         2 + gfy_GetZX7SpriteWidth(_Sprite) * gfy_GetZX7SpriteHeight(_Sprite); \
     })
 
-#if defined(__cplusplus) && __cplusplus >= 201103L
-# define GRAPHY_NOEXCEPT noexcept
-#else /* __cplusplus */
-# define GRAPHY_NOEXCEPT __attribute__((__nothrow__, __leaf__))
-#endif /* __cplusplus */
-#define GRAPHY_PURE GRAPHY_NOEXCEPT __attribute__((__pure__))
-#define GRAPHY_CONST GRAPHY_NOEXCEPT __attribute__((__const__))
-#define GRAPHY_NONNULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
-#define GRAPHY_NONNULL_IF_NONZERO(...) __attribute__((__nonnull_if_nonzero__(__VA_ARGS__)))
-#define GRAPHY_RETURNS_NONNULL __attribute__((__returns_nonnull__))
-#define GRAPHY_STRING_ARG(...) __attribute__((__null_terminated_string_arg__(__VA_ARGS__), __nonnull__(__VA_ARGS__)))
-#if 0
-# define GRAPHY_ALLOCATOR __attribute__((__malloc__))
-#else
-# define GRAPHY_ALLOCATOR
-#endif
-
 /**
  * Initializes the `graphy` library context.
  *
@@ -669,7 +652,7 @@ gfy_sprite_t *gfy_AllocSprite(
     uint8_t width,
     uint8_t height,
     void *(*malloc_routine)(size_t)
-) GRAPHY_ALLOCATOR GRAPHY_NONNULL(3);
+) __attribute__((__nonnull__(3)));
 
 /**
  * Draws a tilemap.
@@ -683,7 +666,7 @@ void gfy_Tilemap(
     const gfy_tilemap_t *tilemap,
     uint24_t x_offset,
     uint24_t y_offset
-) GRAPHY_NONNULL(1);
+);
 
 /**
  * Draws an unclipped tilemap.
@@ -697,7 +680,7 @@ void gfy_Tilemap_NoClip(
     const gfy_tilemap_t *tilemap,
     uint24_t x_offset,
     uint24_t y_offset
-) GRAPHY_NONNULL(1);
+);
 
 /**
  * Draws a transparent tilemap.
@@ -711,7 +694,7 @@ void gfy_TransparentTilemap(
     const gfy_tilemap_t *tilemap,
     uint24_t x_offset,
     uint24_t y_offset
-) GRAPHY_NONNULL(1);
+);
 
 /**
  * Draws an unclipped transparent tilemap.
@@ -725,7 +708,7 @@ void gfy_TransparentTilemap_NoClip(
     const gfy_tilemap_t *tilemap,
     uint24_t x_offset,
     uint24_t y_offset
-) GRAPHY_NONNULL(1);
+);
 
 /**
  * Gets a pointer to a particular sprite tileset index.
@@ -739,20 +722,7 @@ uint8_t *gfy_TilePtr(
     const gfy_tilemap_t *tilemap,
     uint24_t x_offset,
     uint24_t y_offset
-) GRAPHY_PURE GRAPHY_NONNULL(1) GRAPHY_RETURNS_NONNULL;
-
-static inline __attribute__((__always_inline__))
-uint8_t *inline_gfy_TilePtr(const gfy_tilemap_t *tilemap, uint24_t x_offset, uint24_t y_offset) {
-    if (__builtin_constant_p(tilemap) && __builtin_constant_p(x_offset) && __builtin_constant_p(y_offset)) {
-        uint24_t map_row = x_offset / tilemap->tile_width;
-        uint24_t map_col = y_offset / tilemap->tile_height;
-        uint24_t map_index = map_row + (map_col * tilemap->width);
-        return &(tilemap->map[map_index]);
-    }
-    return gfy_TilePtr(tilemap, x_offset, y_offset);
-}
-
-#define gfy_TilePtr(tilemap, x_offset, y_offset) inline_gfy_TilePtr(tilemap, x_offset, y_offset)
+) __attribute__((__pure__));
 
 /**
  * Gets a pointer to a particular sprite tileset index.
@@ -803,7 +773,7 @@ void gfy_SetPalette(
     const void *palette,
     uint24_t size,
     uint8_t offset
-) GRAPHY_NONNULL(1);
+);
 
 /**
  * Fills the screen with a given palette index.
@@ -847,13 +817,12 @@ uint8_t gfy_GetPixel(uint24_t x, uint8_t y);
  * @param[in] y1 Second Y coordinate.
  */
 void gfy_Line(
-    int24_t x0,
-    int24_t y0,
-    int24_t x1,
-    int24_t y1
+    int x0,
+    int y0,
+    int x1,
+    int y1
 );
 
-
 /**
  * Draws an unclipped line.
  *
@@ -878,9 +847,9 @@ void gfy_Line_NoClip(
  * @param[in] length Length of line.
  */
 void gfy_HorizLine(
-    int24_t x,
-    int24_t y,
-    int24_t length
+    int x,
+    int y,
+    int length
 );
 
 /**
@@ -906,9 +875,9 @@ void gfy_HorizLine_NoClip(
  * @param[in] length Length of line
  */
 void gfy_VertLine(
-    int24_t x,
-    int24_t y,
-    int24_t length
+    int x,
+    int y,
+    int length
 );
 
 /**
@@ -933,11 +902,11 @@ void gfy_VertLine_NoClip(
  * @param[in] width Width of rectangle.
  * @param[in] height Height of rectangle.
  */
- void gfy_Rectangle(
-    int24_t x,
-    int24_t y,
-    int24_t width,
-    int24_t height
+void gfy_Rectangle(
+    int x,
+    int y,
+    int width,
+    int height
 );
 
 /**
@@ -964,10 +933,10 @@ void gfy_Rectangle_NoClip(
  * @param[in] height Height of rectangle.
  */
 void gfy_FillRectangle(
-    int24_t x,
-    int24_t y,
-    int24_t width,
-    int24_t height
+    int x,
+    int y,
+    int width,
+    int height
 );
 
 /**
@@ -993,8 +962,8 @@ void gfy_FillRectangle_NoClip(
  * @param[in] radius The radius of the circle.
  */
 void gfy_Circle(
-    int24_t x,
-    int24_t y,
+    int x,
+    int y,
     uint24_t radius
 );
 
@@ -1006,8 +975,8 @@ void gfy_Circle(
  * @param[in] radius The radius of the circle.
  */
 void gfy_FillCircle(
-    int24_t x,
-    int24_t y,
+    int x,
+    int y,
     uint24_t radius
 );
 
@@ -1079,7 +1048,7 @@ void gfy_Ellipse(int24_t x, int24_t y, uint24_t a, uint24_t b);
  * @param[in] points Pointer to x and y pairs.
  * @param[in] num_points Number of x and y pairs.
  */
-void gfy_Polygon(const int24_t *points, size_t num_points) GRAPHY_NONNULL(1);
+void gfy_Polygon(const int *points, size_t num_points);
 
 /**
  * Draws an unclipped polygon outline
@@ -1097,7 +1066,7 @@ void gfy_Polygon(const int24_t *points, size_t num_points) GRAPHY_NONNULL(1);
  * @param[in] points Pointer to x and y pairs
  * @param[in] num_points Number of x and y pairs
  */
-void gfy_Polygon_NoClip(const int24_t *points, size_t num_points) GRAPHY_NONNULL(1);
+void gfy_Polygon_NoClip(const int *points, size_t num_points);
 
 /**
  * Draws a clipped filled triangle.
@@ -1129,12 +1098,12 @@ void gfy_FillTriangle(
  * @param[in] y2 Third Y coordinate.
  */
 void gfy_FillTriangle_NoClip(
-    int24_t x0,
-    int24_t y0,
-    int24_t x1,
-    int24_t y1,
-    int24_t x2,
-    int24_t y2
+    int x0,
+    int y0,
+    int x1,
+    int y1,
+    int x2,
+    int y2
 );
 
 /**
@@ -1248,9 +1217,9 @@ void gfy_BlitColumns(gfy_location_t src, uint24_t x_loc, uint24_t num_columns);
 
 /**
  * Copies a rectangular region between graphics buffers or to the same graphics buffer.
- * The behavior is undefined when the rectangles overlap.
+ * Overlapping rectangles are supported, using memmove-like copy semantics.
  * No clipping is performed as it is a copy not a draw.
- * @param[in] src Graphics buffer to copy from.i
+ * @param[in] src Graphics buffer to copy from.
  * @param[in] dst Graphics buffer to copy to.
  * @param[in] src_x X coordinate on src.
  * @param[in] src_y Y coordinate on src.