Backported changes from f4f7128

* Add VBlank hook to effects
* Make effects use the VBlank handler
* Remove ptplayer.asm features on demand
* Fix mt_data symbol address
* Fix anim-polygons Makefile
* EffectRun: do not render same frame multiple times.

Makefile

@@ -1,6 +1,5 @@
 TOPDIR = $(realpath .)
 
-SUBDIRS = tools lib effects
 SUBDIRS = tools lib system effects
 EXTRA-FILES = tags cscope.out
 CLEAN-FILES = bootloader.bin a500rom.bin addchip.bootblock.bin vbrmove

effects/anim-polygons/Makefile

@@ -6,6 +6,6 @@ PNG2C.dancing-pal := --pixmap gradient,16x22x12
 
 include $(TOPDIR)/build/effect.mk
 
-%.c: %.svg
+data/%.c: data/%.svg
 	@echo "[ANIM] $(DIR)$< -> $(DIR)$@"
 	$(PYTHON3) encode.py $< > $@

effects/anim-polygons/anim-polygons.c

@@ -136,4 +136,4 @@ static void Render(void) {
   maybeSkipFrame = 1;
 }
 
-EFFECT(AnimPolygons, NULL, NULL, Init, Kill, Render);
+EFFECT(AnimPolygons, NULL, NULL, Init, Kill, Render, NULL);

effects/anim/anim.c

@@ -109,4 +109,4 @@ static void Render(void) {
   active = (active + 1) % (DEPTH + 1);
 }
 
-EFFECT(Anim, Load, UnLoad, Init, Kill, Render);
+EFFECT(Anim, Load, UnLoad, Init, Kill, Render, NULL);

effects/ball/ball.c

@@ -347,4 +347,4 @@ static void Render(void) {
   active ^= 1;
 }
 
-EFFECT(Ball, NULL, NULL, Init, Kill, Render);
+EFFECT(Ball, NULL, NULL, Init, Kill, Render, NULL);

effects/blurred/blurred.c

@@ -140,4 +140,4 @@ static void Render(void) {
   active ^= 1;
 }
 
-EFFECT(Blurred, Load, UnLoad, Init, Kill, Render);
+EFFECT(Blurred, Load, UnLoad, Init, Kill, Render, NULL);

effects/blurred3d/blurred3d.c

@@ -495,4 +495,4 @@ static void Render(void) {
   swapr(screen0, screen1);
 }
 
-EFFECT(Blurred3D, Load, UnLoad, Init, Kill, Render);
+EFFECT(Blurred3D, Load, UnLoad, Init, Kill, Render, NULL);

effects/bobs3d/bobs3d.c

@@ -253,4 +253,4 @@ static void Render(void) {
   swapr(screen0, screen1);
 }
 
-EFFECT(Bobs3D, NULL, NULL, Init, Kill, Render);
+EFFECT(Bobs3D, NULL, NULL, Init, Kill, Render, NULL);

effects/bumpmap-rgb/bumpmap-rgb.c

@@ -381,4 +381,4 @@ static void Render(void) {
   active ^= 1;
 }
 
-EFFECT(BumpMapRGB, Load, UnLoad, Init, Kill, Render);
+EFFECT(BumpMapRGB, Load, UnLoad, Init, Kill, Render, NULL);

effects/butterfly-gears/butterfly-gears.c

@@ -203,4 +203,4 @@ static void Render(void) {
   TaskWaitVBlank();
 }
 
-EFFECT(ButterflyGears, NULL, NULL, Init, Kill, Render);
+EFFECT(ButterflyGears, NULL, NULL, Init, Kill, Render, NULL);

effects/circles/circles.c

@@ -44,4 +44,4 @@ static void Render(void) {
   TaskWaitVBlank();
 }
 
-EFFECT(Circles, NULL, NULL, Init, Kill, Render);
+EFFECT(Circles, NULL, NULL, Init, Kill, Render, NULL);

effects/credits/credits.c

@@ -189,4 +189,4 @@ static void Render(void) {
   swapr(cp0, cp1);
 }
 
-EFFECT(Credits, NULL, NULL, Init, Kill, Render);
+EFFECT(Credits, NULL, NULL, Init, Kill, Render, NULL);

effects/empty/empty.c

@@ -27,4 +27,4 @@ static void Render(void) {
   TaskWaitVBlank();
 }
 
-EFFECT(Empty, NULL, NULL, Init, Kill, Render);
+EFFECT(Empty, NULL, NULL, Init, Kill, Render, NULL);

effects/flatshade-convex/flatshade-convex.c

@@ -342,4 +342,4 @@ static void Render(void) {
   active ^= 1;
 }
 
-EFFECT(FlatShadeConvex, Load, UnLoad, Init, Kill, Render);
+EFFECT(FlatShadeConvex, Load, UnLoad, Init, Kill, Render, NULL);

effects/flatshade/flatshade.c

@@ -359,4 +359,4 @@ static void Render(void) {
   swapr(screen0, screen1);
 }
 
-EFFECT(FlatShade, Load, UnLoad, Init, Kill, Render);
+EFFECT(FlatShade, Load, UnLoad, Init, Kill, Render, NULL);

effects/floor-old/floor-old.c

@@ -467,4 +467,4 @@ static void Render(void) {
   active ^= 1;
 }
 
-EFFECT(FloorOld, Load, UnLoad, Init, Kill, Render);
+EFFECT(FloorOld, Load, UnLoad, Init, Kill, Render, NULL);

effects/floor/floor.c

@@ -259,4 +259,4 @@ static void Render(void) {
   active ^= 1;
 }
 
-EFFECT(Floor, NULL, NULL, Init, Kill, Render);
+EFFECT(Floor, NULL, NULL, Init, Kill, Render, NULL);

effects/game-of-life/game-of-life.c

@@ -522,4 +522,4 @@ static void Render(void) {
 #endif
 }
 
-EFFECT(GameOfLife, NULL, NULL, Init, Kill, Render);
+EFFECT(GameOfLife, NULL, NULL, Init, Kill, Render, NULL);

effects/glitch/glitch.c

@@ -133,4 +133,4 @@ static void Render(void) {
   active ^= 1;
 }
 
-EFFECT(Glitch, NULL, NULL, Init, Kill, Render);
+EFFECT(Glitch, NULL, NULL, Init, Kill, Render, NULL);

effects/growing-tree/growing-tree.c

@@ -323,4 +323,4 @@ static void Render(void) {
   TaskWaitVBlank();
 }
 
-EFFECT(GrowingTree, NULL, NULL, Init, Kill, Render);
+EFFECT(GrowingTree, NULL, NULL, Init, Kill, Render, NULL);

effects/gui/gui.c

@@ -137,4 +137,4 @@ static void Render(void) {
   exitLoop = !HandleEvent();
 }
 
-EFFECT(GUI, Load, NULL, Init, Kill, Render);
+EFFECT(GUI, Load, NULL, Init, Kill, Render, NULL);

effects/highway/highway.c

@@ -216,4 +216,4 @@ static void Render(void) {
   active ^= 1;
 }
 
-EFFECT(HighWay, NULL, NULL, Init, Kill, Render);
+EFFECT(HighWay, NULL, NULL, Init, Kill, Render, NULL);

effects/kbtest/kbtest.c

@@ -108,4 +108,4 @@ static void Render(void) {
   exitLoop = !HandleEvent();
 }
 
-EFFECT(KbdTest, NULL, NULL, Init, Kill, Render);
+EFFECT(KbdTest, NULL, NULL, Init, Kill, Render, NULL);

effects/layers/layers.c

@@ -192,4 +192,4 @@ static void Render(void) {
   swapr(cp0, cp1);
 }
 
-EFFECT(Credits, NULL, NULL, Init, Kill, Render);
+EFFECT(Credits, NULL, NULL, Init, Kill, Render, NULL);

effects/lines/lines.c

@@ -101,4 +101,4 @@ static void Render(void) {
   ProfilerStop(Lines);
 }
 
-EFFECT(Lines, Load, UnLoad, Init, NULL, Render);
+EFFECT(Lines, Load, UnLoad, Init, NULL, Render, NULL);

effects/main.c

@@ -24,11 +24,21 @@ static void StartBgTask(void) {
 }
 #endif
 
+static int VBlankISR(void) {
+  if (Effect.VBlank)
+      Effect.VBlank();
+  return 0;
+}
+
+INTSERVER(VBlankInterrupt, 0, (IntFuncT)VBlankISR, NULL);
+
 int main(void) {
   /* NOP that triggers fs-uae debugger to stop and inform GDB that it should
    * fetch segments locations to relocate symbol information read from file. */
   asm volatile("exg %d7,%d7");
 
+  AddIntServer(INTB_VERTB, VBlankInterrupt);
+
 #if BGTASK
   StartBgTask();
 #endif
@@ -39,5 +49,7 @@ int main(void) {
   EffectKill(&Effect);
   EffectUnLoad(&Effect);
 
-  return 0;
+  RemIntServer(INTB_VERTB, VBlankInterrupt);
+
+  return 0; 
 }

effects/metaballs/metaballs.c

@@ -127,4 +127,4 @@ static void Render(void) {
   active ^= 1;
 }
 
-EFFECT(MetaBalls, Load, UnLoad, Init, Kill, Render);
+EFFECT(MetaBalls, Load, UnLoad, Init, Kill, Render, NULL);

effects/multipipe/multipipe.c

@@ -211,4 +211,4 @@ static void Render(void) {
   active ^= 1;
 }
 
-EFFECT(MultiPipe, Load, UnLoad, Init, Kill, Render);
+EFFECT(MultiPipe, Load, UnLoad, Init, Kill, Render, NULL);

effects/neons/neons.c

@@ -5,7 +5,6 @@
 #include "2d.h"
 #include "fx.h"
 #include <stdlib.h>
-#include <system/interrupt.h>
 
 #define WIDTH 320
 #define HEIGHT 256
@@ -108,7 +107,7 @@ static void UnLoad(void) {
   DeleteBitmap(screen[1]);
 }
 
-static int CustomRotatePalette(void) {
+static void CustomRotatePalette(void) {
   u_short *src = palette[0]->colors;
   CopInsT *ins = pal + 1;
   int i = frameCount;
@@ -117,11 +116,9 @@ static int CustomRotatePalette(void) {
   while (--n >= 0)
     CopInsSet16(ins++, src[i++ & 15]);
 
-  return 0;
+  return;
 }
 
-INTSERVER(RotatePaletteInterrupt, 0, (IntFuncT)CustomRotatePalette, NULL);
-
 static void Init(void) {
   EnableDMA(DMAF_BLITTER);
 
@@ -143,15 +140,11 @@ static void Init(void) {
 
   CopListActivate(cp);
   EnableDMA(DMAF_RASTER);
-
-  AddIntServer(INTB_VERTB, RotatePaletteInterrupt);
 }
 
 static void Kill(void) {
   DisableDMA(DMAF_COPPER | DMAF_RASTER | DMAF_BLITTER);
 
-  RemIntServer(INTB_VERTB, RotatePaletteInterrupt);
-
   DeleteCopList(cp);
 }
 
@@ -228,4 +221,4 @@ static void Render(void) {
   active ^= 1;
 }
 
-EFFECT(Neons, Load, UnLoad, Init, Kill, Render);
+EFFECT(Neons, Load, UnLoad, Init, Kill, Render, CustomRotatePalette);

effects/plasma/plasma.c

@@ -177,4 +177,4 @@ static void Render(void) {
   active ^= 1;
 }
 
-EFFECT(Plasma, Load, NULL, Init, Kill, Render);
+EFFECT(Plasma, Load, NULL, Init, Kill, Render, NULL);

effects/playahx/playahx.c

@@ -282,4 +282,4 @@ static bool HandleEvent(void) {
   return true;
 }
 
-EFFECT(PlayAHX, NULL, NULL, Init, Kill, Render);
+EFFECT(PlayAHX, NULL, NULL, Init, Kill, Render, NULL);

effects/playctr/playctr.c

@@ -4,7 +4,6 @@
 #include <console.h>
 #include <copper.h>
 #include <system/event.h>
-#include <system/interrupt.h>
 #include <system/keyboard.h>
 #include <system/memory.h>
 
@@ -49,16 +48,14 @@ static void UnLoad(void) {
   MemFree(module);
 }
 
-static int CinterMusic(void) {
+static void CinterMusic(void) {
   if (stopped)
-    return 0;
+    return;
   CinterPlay1(player);
   CinterPlay2(player);
-  return 0;
+  return;
 }
 
-INTSERVER(CinterMusicServer, 10, (IntFuncT)CinterMusic, NULL);
-
 static void Init(void) {
   KeyboardInit();
 
@@ -83,8 +80,6 @@ static void Init(void) {
   CinterInit(module, instruments, player);
   musicStart = player->c_MusicPointer;
 
-  AddIntServer(INTB_VERTB, CinterMusicServer);
-
   ConsoleSetCursor(&console, 0, 0);
   ConsolePutStr(&console, 
                 "Pause (SPACE) -10s (LEFT) +10s (RIGHT)\n"
@@ -94,8 +89,6 @@ static void Init(void) {
 }
 
 static void Kill(void) {
-  RemIntServer(INTB_VERTB, CinterMusicServer);
-
   DisableDMA(DMAF_COPPER | DMAF_RASTER | DMAF_AUDIO);
 
   DeleteCopList(cp);
@@ -173,4 +166,4 @@ static bool HandleEvent(void) {
   return true;
 }
 
-EFFECT(PlayCinter, Load, UnLoad, Init, Kill, Render);
+EFFECT(PlayCinter, Load, UnLoad, Init, Kill, Render, CinterMusic);

effects/playp61/playp61.c

@@ -4,7 +4,6 @@
 #include <copper.h>
 #include <p61.h>
 #include <system/event.h>
-#include <system/interrupt.h>
 #include <system/keyboard.h>
 #include <system/memory.h>
 #include <system/timer.h>
@@ -24,8 +23,6 @@ static CopListT *cp;
 static ConsoleT console;
 static CIATimerT *p61tmr;
 
-INTSERVER(P61PlayerServer, 10, (IntFuncT)P61_Music, NULL);
-
 static inline void putpixel(u_char *line, short x) {
   bset(line + (x >> 3), ~x);
 }
@@ -118,8 +115,6 @@ static void Init(void) {
   P61_Init(module, NULL, NULL);
   P61_ControlBlock.Play = 1;
 
-  AddIntServer(INTB_VERTB, P61PlayerServer);
-
   ConsolePutStr(&console, 
                 "Pause (SPACE) Prev (LEFT) Next (RIGHT)\n"
                 "Exit (ESC)\n");
@@ -129,7 +124,6 @@ static void Kill(void) {
   P61_ControlBlock.Play = 0;
   P61_End();
 
-  RemIntServer(INTB_VERTB, P61PlayerServer);
   ReleaseTimer(p61tmr);
 
   DisableDMA(DMAF_COPPER | DMAF_RASTER | DMAF_BLITTER);
@@ -222,4 +216,4 @@ static bool HandleEvent(void) {
   return true;
 }
 
-EFFECT(PlayP61, NULL, NULL, Init, Kill, Render);
+EFFECT(PlayP61, NULL, NULL, Init, Kill, Render, P61_Music);

effects/playpt/playpt.c

@@ -4,14 +4,17 @@
 #include <console.h>
 #include <copper.h>
 #include <system/event.h>
-#include <system/interrupt.h>
 #include <system/keyboard.h>
 #include <system/memory.h>
 
 #define WIDTH 320
 #define HEIGHT 256
 #define DEPTH 1
 
+/* XXX: Always consult this value with AmigaKlang output,
+ * otherwise you'll experience a really nasty debugging session. */
+#define AKLANG_BUFLEN 36864
+
 #include "data/lat2-08.c"
 
 extern u_char Module[];
@@ -28,14 +31,12 @@ extern u_int AK_Progress;
 void AK_Generate(void *TmpBuf asm("a1"));
 
 static void Load(void) {
-  void *TmpBuf = MemAlloc(32768, MEMF_PUBLIC);
+  void *TmpBuf = MemAlloc(AKLANG_BUFLEN, MEMF_PUBLIC);
+  Log("Generating samples, please wait...\n");
   AK_Generate(TmpBuf);
   MemFree(TmpBuf);
 }
 
-static void UnLoad(void) {
-}
-
 static void Init(void) {
   KeyboardInit();
 
@@ -181,4 +182,4 @@ static bool HandleEvent(void) {
   return true;
 }
 
-EFFECT(PlayProtracker, Load, UnLoad, Init, Kill, Render);
+EFFECT(PlayProtracker, Load, NULL, Init, Kill, Render, NULL);

effects/plotter/plotter.c

@@ -98,4 +98,4 @@ static void Render(void) {
   active ^= 1;
 }
 
-EFFECT(Plotter, NULL, NULL, Init, Kill, Render);
+EFFECT(Plotter, NULL, NULL, Init, Kill, Render, NULL);