fblibrary: Minor renames in draw_gpoly() sub-functs

mefistotelis · mefistotelis · commit 6bbab457f3a6 · 2025-11-02T00:33:39.000+01:00
diff --git a/bflibrary/src/general/poly_gp.c b/bflibrary/src/general/poly_gp.c
@@ -439,7 +439,7 @@ static TbPixel gpoly_pixel_noshade(struct gpoly_blends *p_bld, const struct gpol
     return ret_l;
 }
 
-static void gpoly_stb_drw_incr2(struct gpoly_blends *p_bld, const struct gpoly_factors *p_inc)
+static void gpoly_stb_drw_incr4(struct gpoly_blends *p_bld, const struct gpoly_factors *p_inc)
 {
     int loc_2d;
     ubyte a3b_h, a3b_l;
@@ -465,7 +465,7 @@ static void gpoly_stb_drw_incr2(struct gpoly_blends *p_bld, const struct gpoly_f
     p_bld->B[1] = (a3b_h << 8) | a3b_l;
 }
 
-static void gpoly_stb_drw_decr1a(struct gpoly_blends *p_bld, const struct gpoly_factors *p_inc)
+static void gpoly_stb_drw_decr4(struct gpoly_blends *p_bld, const struct gpoly_factors *p_inc)
 {
     int loc_2d;
     ubyte a3b_h, a3b_l;
@@ -491,7 +491,7 @@ static void gpoly_stb_drw_decr1a(struct gpoly_blends *p_bld, const struct gpoly_
     p_bld->B[1] = (a3b_h << 8) | a3b_l;
 }
 
-static void gpoly_stb_drw_incr4(struct gpoly_blends *p_bld, const struct gpoly_factors *p_inc)
+static void gpoly_stb_drw_incr3(struct gpoly_blends *p_bld, const struct gpoly_factors *p_inc)
 {
     int loc_2d;
     ubyte a3b_h, a3b_l;
@@ -514,7 +514,7 @@ static void gpoly_stb_drw_incr4(struct gpoly_blends *p_bld, const struct gpoly_f
     p_bld->B[1] = (a3b_h << 8) | a3b_l;
 }
 
-static void gpoly_stb_drw_decr4(struct gpoly_blends *p_bld, const struct gpoly_factors *p_inc)
+static void gpoly_stb_drw_decr3(struct gpoly_blends *p_bld, const struct gpoly_factors *p_inc)
 {
     int loc_2d;
     ubyte a3b_h, a3b_l;
@@ -655,6 +655,7 @@ void gpoly_sta_md03(struct gpoly_state *st)
 
         st->var_098 = loc_incB_U << 16;
         st->var_094 = loc_incB_U >> 16;
+
         fctr_e = loc_incB_V >> 16;
         fctr_f = ((loc_incB_V << 16) & 0xFFFFFF00) | (st->var_094 & 0xFF);
         if ((fctr_f & 0x80) != 0) {
@@ -1035,6 +1036,7 @@ void gpoly_sta_md27(struct gpoly_state *st)
 
         st->var_098 = loc_incB_U << 16;
         st->var_094 = loc_incB_U >> 16;
+
         fctr_e = loc_incB_V >> 16;
         fctr_f = ((loc_incB_V << 16) & 0xFFFFFF00) | (st->var_094 & 0xFF);
         if ((fctr_f & 0x80) != 0) {
@@ -1287,7 +1289,7 @@ void gpoly_rasterize_shaded_bound(struct gpoly_state *st)
     {
         for (;curr_Y < 0; curr_Y++)
         {
-            gpoly_stb_drw_incr2(&bld, &st->incA);
+            gpoly_stb_drw_incr4(&bld, &st->incA);
             loc_0FC = range_beg;
             curr_X -= range_beg >> 16;
             range_end += loc_128;
@@ -1312,19 +1314,19 @@ void gpoly_rasterize_shaded_bound(struct gpoly_state *st)
             if (range_beg_scr < 0)
             {
                 for (; curr_X > 0; curr_X--) {
-                    gpoly_stb_drw_decr1a(&bld, &st->incB);
+                    gpoly_stb_drw_decr4(&bld, &st->incB);
                 }
                 for (; curr_X < 0; curr_X++) {
-                    gpoly_stb_drw_incr2(&bld, &st->incB);
+                    gpoly_stb_drw_incr4(&bld, &st->incB);
                 }
             }
             else
             {
                 for (; curr_X < range_beg_scr; curr_X++) {
-                    gpoly_stb_drw_incr2(&bld, &st->incB);
+                    gpoly_stb_drw_incr4(&bld, &st->incB);
                 }
                 for (; curr_X > range_beg_scr; curr_X--) {
-                    gpoly_stb_drw_decr1a(&bld, &st->incB);
+                    gpoly_stb_drw_decr4(&bld, &st->incB);
                 }
             }
             bld_bkp = bld;
@@ -1365,7 +1367,7 @@ void gpoly_rasterize_shaded_bound(struct gpoly_state *st)
             curr_X += (loc_0FC >> 16);
             range_beg = loc_0FC;
             bld = bld_bkp;
-            gpoly_stb_drw_incr2(&bld, &st->incA);
+            gpoly_stb_drw_incr4(&bld, &st->incA);
             out_ln = &loc_0F4[ln_len];
         }
 
@@ -1453,7 +1455,7 @@ void gpoly_rasterize_shaded_nobound(struct gpoly_state *st)
     {
         for (;curr_Y < 0; curr_Y++)
         {
-            gpoly_stb_drw_incr2(&bld, &st->incA);
+            gpoly_stb_drw_incr4(&bld, &st->incA);
             loc_0FC = range_beg;
             curr_X -= loc_0FC >> 16;
             range_end += loc_128;
@@ -1506,7 +1508,7 @@ void gpoly_rasterize_shaded_nobound(struct gpoly_state *st)
             range_beg = loc_12C + loc_0FC;
             range_end = loc_128 + loc_0F8;
             bld = bld_bkp;
-            gpoly_stb_drw_incr2(&bld, &st->incA);
+            gpoly_stb_drw_incr4(&bld, &st->incA);
             out_ln = &loc_0F4[ln_len];
         }
 
@@ -1597,7 +1599,7 @@ void gpoly_rasterize_noshade_bound(struct gpoly_state *st)
     {
         for (; curr_Y < 0; curr_Y++)
         {
-            gpoly_stb_drw_incr4(&bld, &st->incA);
+            gpoly_stb_drw_incr3(&bld, &st->incA);
             range_beg += loc_12C;
             range_end += loc_128;
             out_ln += ln_len;
@@ -1614,19 +1616,19 @@ void gpoly_rasterize_noshade_bound(struct gpoly_state *st)
             if (range_beg_scr < 0)
             {
                 for (; curr_X > 0; curr_X--) {
-                    gpoly_stb_drw_decr4(&bld, &st->incB);
+                    gpoly_stb_drw_decr3(&bld, &st->incB);
                 }
                 for (; curr_X < 0; curr_X++) {
-                    gpoly_stb_drw_incr4(&bld, &st->incB);
+                    gpoly_stb_drw_incr3(&bld, &st->incB);
                 }
             }
             else
             {
                 for (; curr_X < range_beg_scr; curr_X++) {
-                    gpoly_stb_drw_incr4(&bld, &st->incB);
+                    gpoly_stb_drw_incr3(&bld, &st->incB);
                 }
                 for (; curr_X > range_beg_scr; curr_X--) {
-                    gpoly_stb_drw_decr4(&bld, &st->incB);
+                    gpoly_stb_drw_decr3(&bld, &st->incB);
                 }
             }
             bld_bkp = bld;
@@ -1662,7 +1664,7 @@ void gpoly_rasterize_noshade_bound(struct gpoly_state *st)
             range_beg = loc_12C + loc_0FC;
             range_end = loc_128 + loc_0F8;
             bld = bld_bkp;
-            gpoly_stb_drw_incr4(&bld, &st->incA);
+            gpoly_stb_drw_incr3(&bld, &st->incA);
             out_ln = &loc_0F4[ln_len];
         }
 
@@ -1752,7 +1754,7 @@ void gpoly_rasterize_noshade_nobound(struct gpoly_state *st)
     {
         for (; curr_Y < 0; curr_Y++)
         {
-            gpoly_stb_drw_incr4(&bld, &st->incA);
+            gpoly_stb_drw_incr3(&bld, &st->incA);
             range_beg += loc_12C;
             range_end += loc_128;
             out_ln += ln_len;
@@ -1769,13 +1771,13 @@ void gpoly_rasterize_noshade_nobound(struct gpoly_state *st)
             if (range_beg_scr > curr_X)
             {
                 for (; curr_X < range_beg_scr; curr_X++) {
-                    gpoly_stb_drw_incr4(&bld, &st->incB);
+                    gpoly_stb_drw_incr3(&bld, &st->incB);
                 }
             }
             else
             {
                 for (; curr_X > range_beg_scr; curr_X--) {
-                    gpoly_stb_drw_decr4(&bld, &st->incB);
+                    gpoly_stb_drw_decr3(&bld, &st->incB);
                 }
             }
             bld_bkp = bld;
@@ -1809,7 +1811,7 @@ void gpoly_rasterize_noshade_nobound(struct gpoly_state *st)
             range_beg = loc_12C + loc_0FC;
             range_end = loc_128 + loc_0F8;
             bld = bld_bkp;
-            gpoly_stb_drw_incr4(&bld, &st->incA);
+            gpoly_stb_drw_incr3(&bld, &st->incA);
             out_ln = &loc_0F4[ln_len];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ static TbPixel gpoly_pixel_noshade(struct gpoly_blends *p_bld, const struct gpol`
`439`	`439`	`return ret_l;`
`440`	`440`	`}`
`441`	`441`
`442`		`-static void gpoly_stb_drw_incr2(struct gpoly_blends p_bld, const struct gpoly_factors p_inc)`
	`442`	`+static void gpoly_stb_drw_incr4(struct gpoly_blends p_bld, const struct gpoly_factors p_inc)`
`443`	`443`	`{`
`444`	`444`	`int loc_2d;`
`445`	`445`	`ubyte a3b_h, a3b_l;`
`@@ -465,7 +465,7 @@ static void gpoly_stb_drw_incr2(struct gpoly_blends *p_bld, const struct gpoly_f`
`465`	`465`	`p_bld->B[1] = (a3b_h << 8) \| a3b_l;`
`466`	`466`	`}`
`467`	`467`
`468`		`-static void gpoly_stb_drw_decr1a(struct gpoly_blends p_bld, const struct gpoly_factors p_inc)`
	`468`	`+static void gpoly_stb_drw_decr4(struct gpoly_blends p_bld, const struct gpoly_factors p_inc)`
`469`	`469`	`{`
`470`	`470`	`int loc_2d;`
`471`	`471`	`ubyte a3b_h, a3b_l;`
`@@ -491,7 +491,7 @@ static void gpoly_stb_drw_decr1a(struct gpoly_blends *p_bld, const struct gpoly_`
`491`	`491`	`p_bld->B[1] = (a3b_h << 8) \| a3b_l;`
`492`	`492`	`}`
`493`	`493`
`494`		`-static void gpoly_stb_drw_incr4(struct gpoly_blends p_bld, const struct gpoly_factors p_inc)`
	`494`	`+static void gpoly_stb_drw_incr3(struct gpoly_blends p_bld, const struct gpoly_factors p_inc)`
`495`	`495`	`{`
`496`	`496`	`int loc_2d;`
`497`	`497`	`ubyte a3b_h, a3b_l;`
`@@ -514,7 +514,7 @@ static void gpoly_stb_drw_incr4(struct gpoly_blends *p_bld, const struct gpoly_f`
`514`	`514`	`p_bld->B[1] = (a3b_h << 8) \| a3b_l;`
`515`	`515`	`}`
`516`	`516`
`517`		`-static void gpoly_stb_drw_decr4(struct gpoly_blends p_bld, const struct gpoly_factors p_inc)`
	`517`	`+static void gpoly_stb_drw_decr3(struct gpoly_blends p_bld, const struct gpoly_factors p_inc)`
`518`	`518`	`{`
`519`	`519`	`int loc_2d;`
`520`	`520`	`ubyte a3b_h, a3b_l;`
`@@ -655,6 +655,7 @@ void gpoly_sta_md03(struct gpoly_state *st)`
`655`	`655`
`656`	`656`	`st->var_098 = loc_incB_U << 16;`
`657`	`657`	`st->var_094 = loc_incB_U >> 16;`
	`658`	`+`
`658`	`659`	`fctr_e = loc_incB_V >> 16;`
`659`	`660`	`fctr_f = ((loc_incB_V << 16) & 0xFFFFFF00) \| (st->var_094 & 0xFF);`
`660`	`661`	`if ((fctr_f & 0x80) != 0) {`
`@@ -1035,6 +1036,7 @@ void gpoly_sta_md27(struct gpoly_state *st)`
`1035`	`1036`
`1036`	`1037`	`st->var_098 = loc_incB_U << 16;`
`1037`	`1038`	`st->var_094 = loc_incB_U >> 16;`
	`1039`	`+`
`1038`	`1040`	`fctr_e = loc_incB_V >> 16;`
`1039`	`1041`	`fctr_f = ((loc_incB_V << 16) & 0xFFFFFF00) \| (st->var_094 & 0xFF);`
`1040`	`1042`	`if ((fctr_f & 0x80) != 0) {`
`@@ -1287,7 +1289,7 @@ void gpoly_rasterize_shaded_bound(struct gpoly_state *st)`
`1287`	`1289`	`{`
`1288`	`1290`	`for (;curr_Y < 0; curr_Y++)`
`1289`	`1291`	`{`
`1290`		`- gpoly_stb_drw_incr2(&bld, &st->incA);`
	`1292`	`+ gpoly_stb_drw_incr4(&bld, &st->incA);`
`1291`	`1293`	`loc_0FC = range_beg;`
`1292`	`1294`	`curr_X -= range_beg >> 16;`
`1293`	`1295`	`range_end += loc_128;`
`@@ -1312,19 +1314,19 @@ void gpoly_rasterize_shaded_bound(struct gpoly_state *st)`
`1312`	`1314`	`if (range_beg_scr < 0)`
`1313`	`1315`	`{`
`1314`	`1316`	`for (; curr_X > 0; curr_X--) {`
`1315`		`- gpoly_stb_drw_decr1a(&bld, &st->incB);`
	`1317`	`+ gpoly_stb_drw_decr4(&bld, &st->incB);`
`1316`	`1318`	`}`
`1317`	`1319`	`for (; curr_X < 0; curr_X++) {`
`1318`		`- gpoly_stb_drw_incr2(&bld, &st->incB);`
	`1320`	`+ gpoly_stb_drw_incr4(&bld, &st->incB);`
`1319`	`1321`	`}`
`1320`	`1322`	`}`
`1321`	`1323`	`else`
`1322`	`1324`	`{`
`1323`	`1325`	`for (; curr_X < range_beg_scr; curr_X++) {`
`1324`		`- gpoly_stb_drw_incr2(&bld, &st->incB);`
	`1326`	`+ gpoly_stb_drw_incr4(&bld, &st->incB);`
`1325`	`1327`	`}`
`1326`	`1328`	`for (; curr_X > range_beg_scr; curr_X--) {`
`1327`		`- gpoly_stb_drw_decr1a(&bld, &st->incB);`
	`1329`	`+ gpoly_stb_drw_decr4(&bld, &st->incB);`
`1328`	`1330`	`}`
`1329`	`1331`	`}`
`1330`	`1332`	`bld_bkp = bld;`
`@@ -1365,7 +1367,7 @@ void gpoly_rasterize_shaded_bound(struct gpoly_state *st)`
`1365`	`1367`	`curr_X += (loc_0FC >> 16);`
`1366`	`1368`	`range_beg = loc_0FC;`
`1367`	`1369`	`bld = bld_bkp;`
`1368`		`- gpoly_stb_drw_incr2(&bld, &st->incA);`
	`1370`	`+ gpoly_stb_drw_incr4(&bld, &st->incA);`
`1369`	`1371`	`out_ln = &loc_0F4[ln_len];`
`1370`	`1372`	`}`
`1371`	`1373`
`@@ -1453,7 +1455,7 @@ void gpoly_rasterize_shaded_nobound(struct gpoly_state *st)`
`1453`	`1455`	`{`
`1454`	`1456`	`for (;curr_Y < 0; curr_Y++)`
`1455`	`1457`	`{`
`1456`		`- gpoly_stb_drw_incr2(&bld, &st->incA);`
	`1458`	`+ gpoly_stb_drw_incr4(&bld, &st->incA);`
`1457`	`1459`	`loc_0FC = range_beg;`
`1458`	`1460`	`curr_X -= loc_0FC >> 16;`
`1459`	`1461`	`range_end += loc_128;`
`@@ -1506,7 +1508,7 @@ void gpoly_rasterize_shaded_nobound(struct gpoly_state *st)`
`1506`	`1508`	`range_beg = loc_12C + loc_0FC;`
`1507`	`1509`	`range_end = loc_128 + loc_0F8;`
`1508`	`1510`	`bld = bld_bkp;`
`1509`		`- gpoly_stb_drw_incr2(&bld, &st->incA);`
	`1511`	`+ gpoly_stb_drw_incr4(&bld, &st->incA);`
`1510`	`1512`	`out_ln = &loc_0F4[ln_len];`
`1511`	`1513`	`}`
`1512`	`1514`
`@@ -1597,7 +1599,7 @@ void gpoly_rasterize_noshade_bound(struct gpoly_state *st)`
`1597`	`1599`	`{`
`1598`	`1600`	`for (; curr_Y < 0; curr_Y++)`
`1599`	`1601`	`{`
`1600`		`- gpoly_stb_drw_incr4(&bld, &st->incA);`
	`1602`	`+ gpoly_stb_drw_incr3(&bld, &st->incA);`
`1601`	`1603`	`range_beg += loc_12C;`
`1602`	`1604`	`range_end += loc_128;`
`1603`	`1605`	`out_ln += ln_len;`
`@@ -1614,19 +1616,19 @@ void gpoly_rasterize_noshade_bound(struct gpoly_state *st)`
`1614`	`1616`	`if (range_beg_scr < 0)`
`1615`	`1617`	`{`
`1616`	`1618`	`for (; curr_X > 0; curr_X--) {`
`1617`		`- gpoly_stb_drw_decr4(&bld, &st->incB);`
	`1619`	`+ gpoly_stb_drw_decr3(&bld, &st->incB);`
`1618`	`1620`	`}`
`1619`	`1621`	`for (; curr_X < 0; curr_X++) {`
`1620`		`- gpoly_stb_drw_incr4(&bld, &st->incB);`
	`1622`	`+ gpoly_stb_drw_incr3(&bld, &st->incB);`
`1621`	`1623`	`}`
`1622`	`1624`	`}`
`1623`	`1625`	`else`
`1624`	`1626`	`{`
`1625`	`1627`	`for (; curr_X < range_beg_scr; curr_X++) {`
`1626`		`- gpoly_stb_drw_incr4(&bld, &st->incB);`
	`1628`	`+ gpoly_stb_drw_incr3(&bld, &st->incB);`
`1627`	`1629`	`}`
`1628`	`1630`	`for (; curr_X > range_beg_scr; curr_X--) {`
`1629`		`- gpoly_stb_drw_decr4(&bld, &st->incB);`
	`1631`	`+ gpoly_stb_drw_decr3(&bld, &st->incB);`
`1630`	`1632`	`}`
`1631`	`1633`	`}`
`1632`	`1634`	`bld_bkp = bld;`
`@@ -1662,7 +1664,7 @@ void gpoly_rasterize_noshade_bound(struct gpoly_state *st)`
`1662`	`1664`	`range_beg = loc_12C + loc_0FC;`
`1663`	`1665`	`range_end = loc_128 + loc_0F8;`
`1664`	`1666`	`bld = bld_bkp;`
`1665`		`- gpoly_stb_drw_incr4(&bld, &st->incA);`
	`1667`	`+ gpoly_stb_drw_incr3(&bld, &st->incA);`
`1666`	`1668`	`out_ln = &loc_0F4[ln_len];`
`1667`	`1669`	`}`
`1668`	`1670`
`@@ -1752,7 +1754,7 @@ void gpoly_rasterize_noshade_nobound(struct gpoly_state *st)`
`1752`	`1754`	`{`
`1753`	`1755`	`for (; curr_Y < 0; curr_Y++)`
`1754`	`1756`	`{`
`1755`		`- gpoly_stb_drw_incr4(&bld, &st->incA);`
	`1757`	`+ gpoly_stb_drw_incr3(&bld, &st->incA);`
`1756`	`1758`	`range_beg += loc_12C;`
`1757`	`1759`	`range_end += loc_128;`
`1758`	`1760`	`out_ln += ln_len;`
`@@ -1769,13 +1771,13 @@ void gpoly_rasterize_noshade_nobound(struct gpoly_state *st)`
`1769`	`1771`	`if (range_beg_scr > curr_X)`
`1770`	`1772`	`{`
`1771`	`1773`	`for (; curr_X < range_beg_scr; curr_X++) {`
`1772`		`- gpoly_stb_drw_incr4(&bld, &st->incB);`
	`1774`	`+ gpoly_stb_drw_incr3(&bld, &st->incB);`
`1773`	`1775`	`}`
`1774`	`1776`	`}`
`1775`	`1777`	`else`
`1776`	`1778`	`{`
`1777`	`1779`	`for (; curr_X > range_beg_scr; curr_X--) {`
`1778`		`- gpoly_stb_drw_decr4(&bld, &st->incB);`
	`1780`	`+ gpoly_stb_drw_decr3(&bld, &st->incB);`
`1779`	`1781`	`}`
`1780`	`1782`	`}`
`1781`	`1783`	`bld_bkp = bld;`
`@@ -1809,7 +1811,7 @@ void gpoly_rasterize_noshade_nobound(struct gpoly_state *st)`
`1809`	`1811`	`range_beg = loc_12C + loc_0FC;`
`1810`	`1812`	`range_end = loc_128 + loc_0F8;`
`1811`	`1813`	`bld = bld_bkp;`
`1812`		`- gpoly_stb_drw_incr4(&bld, &st->incA);`
	`1814`	`+ gpoly_stb_drw_incr3(&bld, &st->incA);`
`1813`	`1815`	`out_ln = &loc_0F4[ln_len];`
`1814`	`1816`	`}`
`1815`	`1817`