Updated SagaGFX.hidd for SAGA HW sprite support

Author: WDrijver

arch/m68k-amiga/hidd/sagagfx/sagagfx_hw.h

@@ -50,6 +50,12 @@ static inline __attribute__((always_inline)) ULONG READ32(IPTR a)
     return (*(volatile ULONG*)a);
 }
 
+static inline __attribute__((always_inline)) VOID WRITE8(IPTR a, UBYTE b)
+{
+    D(bug("WRITE8(%p,%02x)\n", a, b));
+    *(volatile UBYTE *)(a) = (b);
+}
+
 static inline __attribute__((always_inline)) VOID WRITE16(IPTR a, UWORD b)
 {
     D(bug("WRITE16(%p,%04x)\n", a, b));

arch/m68k-amiga/hidd/sagagfx/sagagfx_hw_v4.c

@@ -134,19 +134,47 @@ VOID SAGAHW_V4_SetSpriteHide(VOID)
 
 VOID SAGAHW_V4_SetSpriteColors(UWORD *colors)
 {
-    for (int i = 1; i < 4; i++)
+    ULONG colorvalue;
+    
+    for (int i = 0; i < 4; i++)
     {
-        WRITE16(SAGA_V4_VIDEO_SPRITE_CLUT + (i << 1), colors[i]);
+        colorvalue = (colors[i] & (0x0F00)) << 12 | (colors[i] & (0x00F0)) << 8 | (colors[i] & (0x000F)) << 4; // CLUT4->CLUT8
+        
+        //kprintf("Sprite Color %d: %04x -> %08x\n", i, colors[i], colorvalue);
+
+        WRITE16(SAGA_VIDEO_SPRITECLUT_IDX, i);
+        WRITE32(SAGA_VIDEO_SPRITECLUT_RGB, colorvalue);       
     }
 }
 
 VOID SAGAHW_V4_SetSpriteMemory(UBYTE *memory)
 {
-    IPTR ptr = SAGA_V4_VIDEO_SPRITE_DATA;
+    IPTR ptr = SAGA_VIDEO_SPRITEDATA;
 
-    ULONG x, y, pix, val;
+    ULONG x, y, value;
 
-    for (y = 0; y < 16; y++)
+    for (y=0; y < 16; y++)
+    {
+        for (x=0; x < 8; x++)
+        {
+            value = (memory[y * 16 + (x*2)] << 24) | (0xAA)<< 16 | (memory[y * 16 + (x*2) + 1] << 8) | (0xAA);
+            WRITE32(ptr, value);
+            ptr+=4;
+        }
+        for (x=0; x < 8; x++)
+        {
+            WRITE32(ptr, 0x00000000);
+            ptr+=4;
+        }     
+    }
+
+    for (x=0; x < 256; x++)
+    {
+        WRITE32(ptr, 0x00000000);
+        ptr += 4;
+    }       
+
+    /*for (y = 0; y < 16; y++)
     {
         pix = 0x80008000;
         val = 0;
@@ -172,7 +200,7 @@ VOID SAGAHW_V4_SetSpriteMemory(UBYTE *memory)
         
         WRITE32(ptr, val);
         ptr += 4;
-    }
+    }*/
 }
 
 VOID SAGAHW_V4_SetSpritePosition(WORD x, WORD y)

arch/m68k-amiga/hidd/sagagfx/sagagfx_hw_v4.h

@@ -28,8 +28,17 @@
 
 #define SAGA_V4_VIDEO_SPRITE_POSX        0xDFF1D0  // [16-bits] Mouse Sprite X
 #define SAGA_V4_VIDEO_SPRITE_POSY        0xDFF1D2  // [16-bits] Mouse Sprite Y
-#define SAGA_V4_VIDEO_SPRITE_CLUT        0xDFF3A0  // [16-bits] Mouse Sprite CLUT[4]
-#define SAGA_V4_VIDEO_SPRITE_DATA        0xDFF800  // [16-bits] Mouse Sprite DATA[16*16]
+
+//#define SAGA_V4_VIDEO_SPRITE_CLUT        0xDFF3A0  // [16-bits] Mouse Sprite CLUT[4]          [WD] Legacy Cores < 12000
+//#define SAGA_V4_VIDEO_SPRITE_DATA        0xDFF800  // [16-bits] Mouse Sprite DATA[16*16]      [WD] Legacy Cores < 12000
+
+// Hardware sprite: 32x32, 1 byte color index + 1 byte alpha per pixel.
+// LONG layout: [pix0:8][alpha0:8][pix1:8][alpha1:8].
+// Palette: move.w index to $DFF3A8, then move.l RGB888 to $DFF3AA.
+#define SAGA_VIDEO_SPRITEDATA           0x00DFD000
+#define SAGA_VIDEO_SPRITECLUT_IDX       0x00DFF3A8
+#define SAGA_VIDEO_SPRITECLUT_RGB       0x00DFF3AA
+
 
 // PIXEL FORMATS