Pair of CopInsT to store 32-bit pointers (backported from 3f01af7)

* Introduce CopInsPairT to express 32-bit pointer stores. * multipipe: put all cop insns per line into single structure * prisms: similar trick as for multipipe * Fix effects in intro directory.
cahirwpz · Dec 16, 2023 · bc7ca92 · bc7ca92
1 parent 963eb7b
commit bc7ca92
Show file tree

Hide file tree

Showing 53 changed files with 259 additions and 235 deletions.
diff --git a/effects/anim-polygons/anim-polygons.c b/effects/anim-polygons/anim-polygons.c
@@ -14,7 +14,7 @@
 #define DEPTH 4
 
 static BitmapT *screen;
-static CopInsT *bplptr[DEPTH];
+static CopInsPairT *bplptr;
 static CopListT *cp;
 static short active = 0;
 static short maybeSkipFrame = 0;
@@ -27,7 +27,7 @@ static short current_frame = 0;
 
 static void MakeCopperList(CopListT *cp) {
   CopInit(cp);
-  CopSetupBitplanes(cp, bplptr, screen, DEPTH);
+  bplptr = CopSetupBitplanes(cp, screen, DEPTH);
   {
     short *pixels = gradient.pixels;
     short i, j;
@@ -127,7 +127,7 @@ static void Render(void) {
     while (--n >= 0) {
       short i = mod16(active + n + 1 - DEPTH, DEPTH + 1);
       if (i < 0) i += DEPTH + 1;
-      CopInsSet32(bplptr[n], screen->planes[i]);
+      CopInsSet32(&bplptr[n], screen->planes[i]);
     }
   }
 

diff --git a/effects/anim/anim.c b/effects/anim/anim.c
@@ -10,7 +10,7 @@
 #define DEPTH  4
 
 static BitmapT *screen;
-static CopInsT *bplptr[DEPTH];
+static CopInsPairT *bplptr;
 static CopListT *cp;
 static short active = 0;
 
@@ -43,7 +43,7 @@ static void Init(void) {
 
   cp = NewCopList(100);
   CopInit(cp);
-  CopSetupBitplanes(cp, bplptr, screen, DEPTH);
+  bplptr = CopSetupBitplanes(cp, screen, DEPTH);
   CopEnd(cp);
 
   CopListActivate(cp);
@@ -100,7 +100,7 @@ static void Render(void) {
       short i = (active + n + 1 - DEPTH) % (DEPTH + 1);
       if (i < 0)
         i += DEPTH + 1;
-      CopInsSet32(bplptr[n], screen->planes[i]);
+      CopInsSet32(&bplptr[n], screen->planes[i]);
     }
   }
 

diff --git a/effects/ball/ball.c b/effects/ball/ball.c
@@ -18,7 +18,7 @@ static PixmapT *chunky;
 static BitmapT *bitmap;
 static SprDataT *sprdat;
 static SpriteT sprite[2][8];
-static CopInsT *sprptr[8];
+static CopInsPairT *sprptr;
 
 #include "data/dragon-bg.c"
 #include "data/texture-15.c"
@@ -81,15 +81,15 @@ static void MakeUVMapRenderCode(void) {
 
 static void MakeCopperList(CopListT *cp) {
   CopInit(cp);
-  CopSetupBitplanes(cp, NULL, &background, S_DEPTH);
-  CopSetupSprites(cp, sprptr);
+  CopSetupBitplanes(cp, &background, S_DEPTH);
+  sprptr = CopSetupSprites(cp);
   CopEnd(cp);
 
   {
     short i;
 
     for (i = 0; i < 8; i++)
-      CopInsSetSprite(sprptr[i], &sprite[active][i]);
+      CopInsSetSprite(&sprptr[i], &sprite[active][i]);
   }
 }
 
@@ -308,7 +308,7 @@ static void BitmapToSprite(BitmapT *input, SpriteT sprite[8]) {
 static void PositionSprite(SpriteT sprite[8], short xo, short yo) {
   short x = X((S_WIDTH - WIDTH) / 2) + xo;
   short y = Y((S_HEIGHT - HEIGHT) / 2) + yo;
-  CopInsT **ptr = sprptr;
+  CopInsPairT *ptr = sprptr;
   short n = 4;
 
   while (--n >= 0) {
@@ -318,8 +318,8 @@ static void PositionSprite(SpriteT sprite[8], short xo, short yo) {
     SpriteUpdatePos(spr0, x, y);
     SpriteUpdatePos(spr1, x, y);
 
-    CopInsSetSprite(*ptr++, spr0);
-    CopInsSetSprite(*ptr++, spr1);
+    CopInsSetSprite(ptr++, spr0);
+    CopInsSetSprite(ptr++, spr1);
 
     x += 16;
   }

diff --git a/effects/blurred/blurred.c b/effects/blurred/blurred.c
@@ -16,7 +16,7 @@ static u_short active = 0;
 
 static BitmapT *carry;
 static BitmapT *buffer;
-static CopInsT *bplptr[2][DEPTH];
+static CopInsPairT *bplptr[2];
 static CopListT *cp;
 
 #include "data/blurred-pal-1.c"
@@ -39,16 +39,20 @@ static void MakeCopperList(CopListT *cp) {
   short i;
 
   CopInit(cp);
-  CopSetupBitplanes(cp, bplptr[active], screen[active], DEPTH);
+  bplptr[0] = CopSetupBitplanes(cp, screen[active], DEPTH);
   CopWait(cp, Y(-18), 0);
   CopLoadPal(cp, &blurred_1_pal, 0);
   CopWait(cp, Y(127), 0);
   CopMove16(cp, dmacon, DMAF_RASTER);
   CopLoadPal(cp, &blurred_2_pal, 0);
   CopWait(cp, Y(128), 0);
   CopMove16(cp, dmacon, DMAF_SETCLR | DMAF_RASTER);
-  for (i = 0; i < DEPTH; i++)
-    bplptr[1][i] = CopMove32(cp, bplpt[i], screen[active]->planes[i] - WIDTH / 16);
+  for (i = 0; i < DEPTH; i++) {
+    CopInsPairT *ins =
+      CopMove32(cp, bplpt[i], screen[0]->planes[i] - WIDTH / 16);
+    if (bplptr[1])
+      bplptr[1] = ins;
+  }
   CopEnd(cp);
 }
 
@@ -132,8 +136,8 @@ static void Render(void) {
 
 
   ITER(i, 0, DEPTH - 1, {
-    CopInsSet32(bplptr[0][i], screen[active]->planes[i]);
-    CopInsSet32(bplptr[1][i], screen[active]->planes[i] - WIDTH / 16);
+    CopInsSet32(&bplptr[0][i], screen[active]->planes[i]);
+    CopInsSet32(&bplptr[1][i], screen[active]->planes[i] - WIDTH / 16);
     });
 
   TaskWaitVBlank();

diff --git a/effects/blurred3d/blurred3d.c b/effects/blurred3d/blurred3d.c
@@ -15,7 +15,7 @@
 
 static Object3D *cube;
 static CopListT *cp;
-static CopInsT *bplptr[DEPTH];
+static CopInsPairT *bplptr;
 static BitmapT *screen0, *screen1;
 static BitmapT *scratchpad;
 static BitmapT *carry;
@@ -36,7 +36,7 @@ static void UnLoad(void) {
 
 static void MakeCopperList(CopListT *cp) {
   CopInit(cp);
-  CopSetupBitplanes(cp, bplptr, screen0, DEPTH);
+  bplptr = CopSetupBitplanes(cp, screen0, DEPTH);
 
   {
     short *pixels = gradient.pixels;
@@ -488,7 +488,7 @@ static void Render(void) {
     short n = DEPTH;
 
     while (--n >= 0)
-      CopInsSet32(bplptr[n], screen0->planes[n]);
+      CopInsSet32(&bplptr[n], screen0->planes[n]);
   }
 
   TaskWaitVBlank();

diff --git a/effects/bobs3d/bobs3d.c b/effects/bobs3d/bobs3d.c
@@ -13,7 +13,7 @@
 static Object3D *cube;
 static CopListT *cp;
 static BitmapT *screen0, *screen1;
-static CopInsT *bplptr[DEPTH];
+static CopInsPairT *bplptr;
 
 #include "data/flares32.c"
 #include "data/pilka.c"
@@ -23,7 +23,7 @@ static Mesh3D *mesh = &pilka;
 static void MakeCopperList(CopListT *cp) {
   CopInit(cp);
   CopWait(cp, Y(-1), 0);
-  CopSetupBitplanes(cp, bplptr, screen1, DEPTH);
+  bplptr = CopSetupBitplanes(cp, screen1, DEPTH);
   CopEnd(cp);
 }
 

diff --git a/effects/bumpmap-rgb/bumpmap-rgb.c b/effects/bumpmap-rgb/bumpmap-rgb.c
@@ -18,7 +18,7 @@ static u_short *shademap;
 static u_short *colormap;
 static u_short *chunky[2];
 static CopListT *cp;
-static CopInsT *bplptr[DEPTH];
+static CopInsPairT *bplptr;
 
 #include "data/dragon.c"
 #include "data/light.c"
@@ -250,10 +250,10 @@ static void ChunkyToPlanar(void) {
       break;
 
     case 12:
-      CopInsSet32(bplptr[0], bpl[3]);
-      CopInsSet32(bplptr[1], bpl[2]);
-      CopInsSet32(bplptr[2], bpl[1]);
-      CopInsSet32(bplptr[3], bpl[0]);
+      CopInsSet32(&bplptr[0], bpl[3]);
+      CopInsSet32(&bplptr[1], bpl[2]);
+      CopInsSet32(&bplptr[2], bpl[1]);
+      CopInsSet32(&bplptr[3], bpl[0]);
       break;
 
     default:
@@ -269,7 +269,7 @@ static void MakeCopperList(CopListT *cp) {
   short i;
 
   CopInit(cp);
-  CopSetupBitplanes(cp, bplptr, screen[active], DEPTH);
+  bplptr = CopSetupBitplanes(cp, screen[active], DEPTH);
   CopLoadColor(cp, 0, 15, 0);
   for (i = 0; i < HEIGHT * 4; i++) {
     CopWaitSafe(cp, Y(i), 0);

diff --git a/effects/butterfly-gears/butterfly-gears.c b/effects/butterfly-gears/butterfly-gears.c
@@ -106,7 +106,7 @@ static void MakeBallCopperList(BallCopListT *ballCp) {
   CopInit(cp);
   CopMove16(cp, dmacon, DMAF_SETCLR | DMAF_RASTER);
   CopLoadPal(cp, &testscreen_pal, 0);
-  CopSetupBitplanes(cp, NULL, &testscreen, testscreen.depth);
+  CopSetupBitplanes(cp, &testscreen, testscreen.depth);
 
   ballCp->upperBallCopper = cp->curr;
   InitCopperListBall(cp, Y0 + 2, 2);

diff --git a/effects/circles/circles.c b/effects/circles/circles.c
@@ -18,7 +18,7 @@ static void Init(void) {
   SetColor(1, 0xfff);
 
   CopInit(cp);
-  CopSetupBitplanes(cp, NULL, screen, DEPTH);
+  CopSetupBitplanes(cp, screen, DEPTH);
   CopEnd(cp);
 
   CopListActivate(cp);

diff --git a/effects/credits/credits.c b/effects/credits/credits.c
@@ -61,7 +61,7 @@ static void MakeCopperList(CopListT *cp) {
   CopWaitSafe(cp, DISCO_Y - 1, 0);
   CopLoadPal(cp, &disco_pal, 0);
   CopSetupMode(cp, MODE_LORES, disco.depth);
-  CopSetupBitplanes(cp, NULL, &disco, disco.depth);
+  CopSetupBitplanes(cp, &disco, disco.depth);
   CopSetupBitplaneFetch(cp, MODE_LORES, DISCO_X, disco.width);
 
   CopWaitSafe(cp, DISCO_Y, 0);

diff --git a/effects/flatshade-convex/flatshade-convex.c b/effects/flatshade-convex/flatshade-convex.c
@@ -11,7 +11,7 @@
 
 static Object3D *cube;
 static CopListT *cp;
-static CopInsT *bplptr[DEPTH];
+static CopInsPairT *bplptr;
 static BitmapT *screen[2];
 static short active;
 
@@ -42,7 +42,7 @@ static void Init(void) {
 
   cp = NewCopList(80);
   CopInit(cp);
-  CopSetupBitplanes(cp, bplptr, screen[0], DEPTH);
+  bplptr = CopSetupBitplanes(cp, screen[0], DEPTH);
   CopEnd(cp);
   CopListActivate(cp);
   EnableDMA(DMAF_BLITTER | DMAF_RASTER | DMAF_BLITHOG);

diff --git a/effects/flatshade/flatshade.c b/effects/flatshade/flatshade.c
@@ -10,7 +10,7 @@
 
 static Object3D *cube;
 static CopListT *cp;
-static CopInsT *bplptr[DEPTH];
+static CopInsPairT *bplptr;
 static BitmapT *screen0, *screen1;
 static BitmapT *buffer;
 
@@ -40,7 +40,7 @@ static void Init(void) {
 
   cp = NewCopList(80);
   CopInit(cp);
-  CopSetupBitplanes(cp, bplptr, screen0, DEPTH);
+  bplptr = CopSetupBitplanes(cp, screen0, DEPTH);
   CopEnd(cp);
   CopListActivate(cp);
   EnableDMA(DMAF_BLITTER | DMAF_RASTER | DMAF_BLITHOG);

diff --git a/effects/floor-old/floor-old.c b/effects/floor-old/floor-old.c
@@ -99,7 +99,7 @@ static void MakeCopperList(CopListT *cp, short num) {
   short i, j;
 
   CopInit(cp);
-  CopSetupBitplanes(cp, NULL, screen[num], DEPTH);
+  CopSetupBitplanes(cp, screen[num], DEPTH);
   CopLoadColor(cp, 0, 3, 0);
 
   for (i = 0; i < FAR_Y; i++) {

diff --git a/effects/floor/floor.c b/effects/floor/floor.c
@@ -70,7 +70,7 @@ static void MakeCopperList(CopListT *cp, short n) {
   short i;
 
   CopInit(cp);
-  CopSetupBitplanes(cp, NULL, &floor, DEPTH);
+  CopSetupBitplanes(cp, &floor, DEPTH);
 
   for (i = 0; i < HEIGHT; i++) {
     CopWait(cp, Y(i), 0);

diff --git a/effects/game-of-life/game-of-life.c b/effects/game-of-life/game-of-life.c
@@ -93,10 +93,10 @@ static BitmapT *current_board;
 static BitmapT *boards[BOARD_COUNT];
 
 // pointers to copper instructions, for rewriting bitplane pointers
-static CopInsT *bplptr[DISP_DEPTH];
+static CopInsPairT *bplptr;
 
 // pointers to copper instructions, for setting colors
-static CopInsT *palptr[COLORS];
+static CopInsT *palptr;
 
 // circular buffer of previous game states as they would be rendered (with
 // horizontally doubled pixels)
@@ -305,25 +305,24 @@ static void ChangePalette(const u_short* pal) {
     {
       u_short next_i = i << 1;
       for (j = i; j < next_i; j++)
-        CopInsSet16(palptr[j], *pal);
+        CopInsSet16(&palptr[j], *pal);
       i = next_i;
       pal++;
     }
 }
 
 static void MakeCopperList(CopListT *cp) {
-  u_short i;
-  u_short* color = palette.colors;
+  short i;
 
   CopInit(cp);
   // initially previous states are empty
   // save addresses of these instructions to change bitplane
   // order when new state gets generated
-  for (i = 0; i < DISP_DEPTH; i++)
-    bplptr[i] = CopMove32(cp, bplpt[i], prev_states[i]->planes[0]);
+  bplptr = CopInsPtr(cp);
+  for (i = 0; i < DISP_DEPTH; i++) 
+    CopMove32(cp, bplpt[i], prev_states[i]->planes[0]);
 
-  for (i = 0; i < COLORS; i++)
-    palptr[i] = CopSetColor(cp, i, *color++);
+  palptr = CopLoadPal(cp, &palette, 0);
 
   for (i = 1; i <= DISP_HEIGHT; i += 2) {
     // vertical pixel doubling
@@ -347,7 +346,7 @@ static void UpdateBitplanePointers(void) {
     // state) to newest game state, so 0th bitplane displays the oldest+1 state
     // and (PREV_STATES_DEPTH-1)'th bitplane displays the newest state
     cur = prev_states[(states_head + i + 1) % PREV_STATES_DEPTH];
-    CopInsSet32(bplptr[i - 1], cur->planes[0]);
+    CopInsSet32(&bplptr[i - 1], cur->planes[0]);
   }
 }
 

diff --git a/effects/glitch/glitch.c b/effects/glitch/glitch.c
@@ -11,7 +11,7 @@
 
 static BitmapT *screen[2];
 static short active = 0;
-static CopInsT *bplptr[DEPTH];
+static CopInsPairT *bplptr;
 static CopListT *cp;
 static CopInsT *line[HEIGHT];
 
@@ -65,7 +65,7 @@ static void Init(void) {
 
   cp = NewCopList(100 + HEIGHT * 2);
   CopInit(cp);
-  CopSetupBitplanes(cp, bplptr, screen[active], DEPTH);
+  bplptr = CopSetupBitplanes(cp, screen[active], DEPTH);
   for (i = 0; i < HEIGHT; i++) {
     CopWait(cp, Y(YSTART + i), 0);
     /* Alternating shift by one for bitplane data. */
@@ -128,7 +128,7 @@ static void Render(void) {
 
   ProfilerStop(RenderGlitch);
 
-  ITER(i, 0, DEPTH - 1, CopInsSet32(bplptr[i], screen[active]->planes[i]));
+  ITER(i, 0, DEPTH - 1, CopInsSet32(&bplptr[i], screen[active]->planes[i]));
   TaskWaitVBlank();
   active ^= 1;
 }