X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=platforms%2Famiga%2Frtg%2Frtg_driver_amiga%2Fpigfx.c;h=733eaa81dd32647fd38e7148798d266630674f4e;hb=2e8cab2c21b6b0a1a06861c9a553098c37ab7dd5;hp=37c75b0d00a1d9fd9645596ace9ac5efa0ae9580;hpb=10d5229b689aa1c7c86a6afe307cd4fbba7c3620;p=pistorm

diff --git a/platforms/amiga/rtg/rtg_driver_amiga/pigfx.c b/platforms/amiga/rtg/rtg_driver_amiga/pigfx.c
index 37c75b0..733eaa8 100644
--- a/platforms/amiga/rtg/rtg_driver_amiga/pigfx.c
+++ b/platforms/amiga/rtg/rtg_driver_amiga/pigfx.c
@@ -94,6 +94,12 @@ void DrawLine (__REGA0(struct BoardInfo *b), __REGA1(struct RenderInfo *r), __RE
 void BlitPlanar2Chunky (__REGA0(struct BoardInfo *b), __REGA1(struct BitMap *bm), __REGA2(struct RenderInfo *r), __REGD0(SHORT x), __REGD1(SHORT y), __REGD2(SHORT dx), __REGD3(SHORT dy), __REGD4(SHORT w), __REGD5(SHORT h), __REGD6(UBYTE minterm), __REGD7(UBYTE mask));
 void BlitPlanar2Direct (__REGA0(struct BoardInfo *b), __REGA1(struct BitMap *bmp), __REGA2(struct RenderInfo *r), __REGA3(struct ColorIndexMapping *clut), __REGD0(SHORT x), __REGD1(SHORT y), __REGD2(SHORT dx), __REGD3(SHORT dy), __REGD4(SHORT w), __REGD5(SHORT h), __REGD6(UBYTE minterm), __REGD7(UBYTE mask));
 
+void SetSprite (__REGA0(struct BoardInfo *b), __REGD0(BOOL what), __REGD7(RGBFTYPE format));
+void SetSpritePosition (__REGA0(struct BoardInfo *b), __REGD0(WORD x), __REGD1(WORD y), __REGD7(RGBFTYPE format));
+void SetSpriteImage (__REGA0(struct BoardInfo *b), __REGD7(RGBFTYPE format));
+void SetSpriteColor (__REGA0(struct BoardInfo *b), __REGD0(UBYTE idx), __REGD1(UBYTE R), __REGD2(UBYTE G), __REGD3(UBYTE B), __REGD7(RGBFTYPE format));
+
+
 static ULONG LibStart(void) {
   return(-1);
 }
@@ -274,16 +280,16 @@ int InitCard(__REGA0(struct BoardInfo* b)) {
   b->PaletteChipType = PCT_MNT_ZZ9000;
   b->GraphicsControllerType = GCT_MNT_ZZ9000;
 
-  b->Flags = BIF_INDISPLAYCHAIN | BIF_GRANTDIRECTACCESS;
+  b->Flags = BIF_INDISPLAYCHAIN | BIF_GRANTDIRECTACCESS | BIF_HARDWARESPRITE;
   b->RGBFormats = 1 | 2 | 512 | 1024 | 2048;
   b->SoftSpriteFlags = 0;
   b->BitsPerCannon = 8;
 
   for(i = 0; i < MAXMODES; i++) {
-    b->MaxHorValue[i] = 1920;
-    b->MaxVerValue[i] = 1080;
-    b->MaxHorResolution[i] = 1920;
-    b->MaxVerResolution[i] = 1080;
+    b->MaxHorValue[i] = 8192;
+    b->MaxVerValue[i] = 8192;
+    b->MaxHorResolution[i] = 8192;
+    b->MaxVerResolution[i] = 8192;
     b->PixelClockCount[i] = 1;
   }
 
@@ -318,8 +324,8 @@ int InitCard(__REGA0(struct BoardInfo* b)) {
   //b->ScrollPlanar = (void *)NULL;
   //b->UpdatePlanar = (void *)NULL;
 
-  //b->BlitPlanar2Chunky = (void *)BlitPlanar2Chunky;
-  //b->BlitPlanar2Direct = (void *)NULL;
+  b->BlitPlanar2Chunky = (void *)BlitPlanar2Chunky;
+  b->BlitPlanar2Direct = (void *)BlitPlanar2Direct;
 
   b->FillRect = (void *)FillRect;
   b->InvertRect = (void *)InvertRect;
@@ -343,10 +349,10 @@ int InitCard(__REGA0(struct BoardInfo* b)) {
   //b->FreeBitMap = (void *)NULL;
   //b->GetBitMapAttr = (void *)NULL;
 
-  //b->SetSprite = (void *)NULL;
-  //b->SetSpritePosition = (void *)NULL;
-  //b->SetSpriteImage = (void *)NULL;
-  //b->SetSpriteColor = (void *)NULL;
+  b->SetSprite = (void *)SetSprite;
+  b->SetSpritePosition = (void *)SetSpritePosition;
+  b->SetSpriteImage = (void *)SetSpriteImage;
+  b->SetSpriteColor = (void *)SetSpriteColor;
 
   //b->CreateFeature = (void *)NULL;
   //b->SetFeatureAttrs = (void *)NULL;
@@ -510,6 +516,12 @@ void FillRect (__REGA0(struct BoardInfo *b), __REGA1(struct RenderInfo *r), __RE
 void InvertRect (__REGA0(struct BoardInfo *b), __REGA1(struct RenderInfo *r), __REGD0(WORD x), __REGD1(WORD y), __REGD2(WORD w), __REGD3(WORD h), __REGD4(UBYTE mask), __REGD7(RGBFTYPE format)) {
   if (!r)
     return;
+  
+  if (mask != 0xFF) {
+    b->InvertRectDefault(b, r, x, y, w, h, mask, format);
+    return;
+  }
+
   WRITELONG(RTG_ADDR1, (unsigned long)r->Memory);
   
   WRITESHORT(RTG_FORMAT, rgbf_to_rtg[format]);
@@ -657,61 +669,67 @@ void DrawLine (__REGA0(struct BoardInfo *b), __REGA1(struct RenderInfo *r), __RE
   WRITESHORT(RTG_COMMAND, RTGCMD_DRAWLINE);
 }
 
-void BlitPlanar2Chunky_Broken (__REGA0(struct BoardInfo *b), __REGA1(struct BitMap *bm), __REGA2(struct RenderInfo *r), __REGD0(SHORT x), __REGD1(SHORT y), __REGD2(SHORT dx), __REGD3(SHORT dy), __REGD4(SHORT w), __REGD5(SHORT h), __REGD6(UBYTE minterm), __REGD7(UBYTE mask)) {
-  if (!r || !b || !bm) return;
+void BlitPlanar2Chunky (__REGA0(struct BoardInfo *b), __REGA1(struct BitMap *bm), __REGA2(struct RenderInfo *r), __REGD0(SHORT x), __REGD1(SHORT y), __REGD2(SHORT dx), __REGD3(SHORT dy), __REGD4(SHORT w), __REGD5(SHORT h), __REGD6(UBYTE minterm), __REGD7(UBYTE mask)) {
+  if (!b || !r)
+    return;
 
-  //unsigned long bmp_size = bm->BytesPerRow * bm->Rows;
-  unsigned char planemask_0 = 0, planemask = 0;
-  //unsigned short line_size = (w >> 3) + 2;
-  //unsigned long output_plane_size = line_size * h;
-  unsigned long plane_size = bm->BytesPerRow * bm->Rows;
-  short x_offset = (x >> 3);
+  uint32_t plane_size = bm->BytesPerRow * bm->Rows;
+
+  uint32_t template_addr = CARD_SCRATCH;
+
+  uint16_t plane_mask = mask;
+  uint8_t ff_mask = 0x00;
+  uint8_t cur_plane = 0x01;
 
-  unsigned long dest = CARD_SCRATCH;
+  uint16_t line_size = (w >> 3) + 2;
+  uint32_t output_plane_size = line_size * h;
+  uint16_t x_offset = (x >> 3);
 
   WRITELONG(RTG_ADDR1, (unsigned long)r->Memory);
-  WRITELONG(RTG_ADDR2, (unsigned long)dest);
-  WRITELONG(RTG_ADDR3, (unsigned long)bm->Planes[0]);
+  WRITELONG(RTG_ADDR2, template_addr);
+  WRITESHORT(RTG_X4, r->BytesPerRow);
+  WRITESHORT(RTG_X5, line_size);
+  WRITESHORT(RTG_FORMAT, rgbf_to_rtg[r->RGBFormat]);
 
-  for (unsigned short i = 0; i < bm->Depth; i++) {
-    if ((unsigned long)bm->Planes[i] == 0xFFFFFFFF) {
-      planemask |= (1 << i);
-    }
-    else if (bm->Planes[i] == NULL) {
-      planemask_0 |= (1 << i);
+  WRITEBYTE(RTG_U81, mask);
+  WRITEBYTE(RTG_U82, minterm);
+
+  for (int16_t i = 0; i < bm->Depth; i++) {
+    uint16_t x_offset = (x >> 3);
+    if ((uint32_t)bm->Planes[i] == 0xFFFFFFFF) {
+      uint8_t* dest = (uint8_t*)((uint32_t)template_addr);
+      memset(dest, 0xFF, output_plane_size);
     }
-    else {
-      unsigned long bmp_mem = (unsigned long)(bm->Planes[i]) + x_offset + (y * bm->BytesPerRow);
-      unsigned long plane_dest = dest;
-      for (unsigned short y_line = 0; y_line < h; y_line++) {
-        memcpy((unsigned char *)plane_dest, (unsigned char *)bmp_mem, bm->BytesPerRow);
-        plane_dest += bm->BytesPerRow;
+    else if (bm->Planes[i] != NULL) {
+      uint8_t* bmp_mem = (uint8_t*)bm->Planes[i] + (y * bm->BytesPerRow) + x_offset;
+      uint8_t* dest = (uint8_t*)((uint32_t)template_addr);
+      for (int16_t y_line = 0; y_line < h; y_line++) {
+        memcpy(dest, bmp_mem, line_size);
+        dest += line_size;
         bmp_mem += bm->BytesPerRow;
       }
     }
-    dest += plane_size;
+    else {
+      plane_mask &= (cur_plane ^ 0xFF);
+    }
+    cur_plane <<= 1;
+    template_addr += output_plane_size;
   }
 
-  WRITESHORT(RTG_X1, x % 0x07);
+  WRITESHORT(RTG_X1, (x & 0x07));
   WRITESHORT(RTG_X2, dx);
   WRITESHORT(RTG_X3, w);
   WRITESHORT(RTG_Y1, 0);
   WRITESHORT(RTG_Y2, dy);
   WRITESHORT(RTG_Y3, h);
 
-  WRITESHORT(RTG_Y4, bm->Rows);
-  WRITESHORT(RTG_X4, r->BytesPerRow);
-  WRITESHORT(RTG_U1, planemask_0 << 8 | planemask);
-  WRITESHORT(RTG_U2, bm->BytesPerRow);
-
-  WRITEBYTE(RTG_U81, mask);
-  WRITEBYTE(RTG_U82, minterm);
+  WRITESHORT(RTG_U1, (plane_mask << 8 | ff_mask));
   WRITEBYTE(RTG_U83, bm->Depth);
 
   WRITESHORT(RTG_COMMAND, RTGCMD_P2C);
 }
 
-void BlitPlanar2Chunky (__REGA0(struct BoardInfo *b), __REGA1(struct BitMap *bm), __REGA2(struct RenderInfo *r), __REGD0(SHORT x), __REGD1(SHORT y), __REGD2(SHORT dx), __REGD3(SHORT dy), __REGD4(SHORT w), __REGD5(SHORT h), __REGD6(UBYTE minterm), __REGD7(UBYTE mask)) {
+void BlitPlanar2Direct (__REGA0(struct BoardInfo *b), __REGA1(struct BitMap *bm), __REGA2(struct RenderInfo *r), __REGA3(struct ColorIndexMapping *clut), __REGD0(SHORT x), __REGD1(SHORT y), __REGD2(SHORT dx), __REGD3(SHORT dy), __REGD4(SHORT w), __REGD5(SHORT h), __REGD6(UBYTE minterm), __REGD7(UBYTE mask)) {
   if (!b || !r)
     return;
 
@@ -736,11 +754,14 @@ void BlitPlanar2Chunky (__REGA0(struct BoardInfo *b), __REGA1(struct BitMap *bm)
   WRITEBYTE(RTG_U81, mask);
   WRITEBYTE(RTG_U82, minterm);
 
+  memcpy((uint8_t*)((uint32_t)template_addr), clut->Colors, (256 << 2));
+  template_addr += (256 << 2);
+
   for (int16_t i = 0; i < bm->Depth; i++) {
     uint16_t x_offset = (x >> 3);
     if ((uint32_t)bm->Planes[i] == 0xFFFFFFFF) {
-      //memset((uint8_t*)(((uint32_t)b->memory)+template_addr), 0xFF, output_plane_size);
-      ff_mask |= cur_plane;
+      uint8_t* dest = (uint8_t*)((uint32_t)template_addr);
+      memset(dest, 0xFF, output_plane_size);
     }
     else if (bm->Planes[i] != NULL) {
       uint8_t* bmp_mem = (uint8_t*)bm->Planes[i] + (y * bm->BytesPerRow) + x_offset;
@@ -768,9 +789,45 @@ void BlitPlanar2Chunky (__REGA0(struct BoardInfo *b), __REGA1(struct BitMap *bm)
   WRITESHORT(RTG_U1, (plane_mask << 8 | ff_mask));
   WRITEBYTE(RTG_U83, bm->Depth);
 
-  WRITESHORT(RTG_COMMAND, RTGCMD_P2C);
+  WRITESHORT(RTG_COMMAND, RTGCMD_P2D);
+}
+
+void SetSprite (__REGA0(struct BoardInfo *b), __REGD0(BOOL what), __REGD7(RGBFTYPE format)) {
+  WRITESHORT(RTG_COMMAND, RTGCMD_SETSPRITE);
+}
+
+void SetSpritePosition (__REGA0(struct BoardInfo *b), __REGD0(WORD x), __REGD1(WORD y), __REGD7(RGBFTYPE format)) {
+  WRITESHORT(RTG_X1, x);
+  WRITESHORT(RTG_Y1, y);
+
+  WRITESHORT(RTG_COMMAND, RTGCMD_SETSPRITEPOS);
+}
+
+void SetSpriteImage (__REGA0(struct BoardInfo *b), __REGD7(RGBFTYPE format)) {
+  WRITESHORT(RTG_X1, b->XOffset);
+  WRITESHORT(RTG_Y1, b->YOffset);
+  WRITEBYTE(RTG_U81, b->MouseWidth);
+  WRITEBYTE(RTG_U82, b->MouseHeight);
+
+  uint8_t* dest = (uint8_t*)((uint32_t)CARD_SCRATCH);
+  uint8_t* src = (uint8_t *)b->MouseImage;
+  uint16_t data_size = ((b->MouseWidth >> 3) * 2) * (b->MouseHeight);
+
+  if (b->MouseWidth > 16) src += 8;
+  else src += 4;
+
+  memcpy(dest, src, data_size);
+
+  WRITELONG(RTG_ADDR2, CARD_SCRATCH);
+
+  WRITESHORT(RTG_COMMAND, RTGCMD_SETSPRITEIMAGE);
 }
 
-void BlitPlanar2Direct (__REGA0(struct BoardInfo *b), __REGA1(struct BitMap *bmp), __REGA2(struct RenderInfo *r), __REGA3(struct ColorIndexMapping *clut), __REGD0(SHORT x), __REGD1(SHORT y), __REGD2(SHORT dx), __REGD3(SHORT dy), __REGD4(SHORT w), __REGD5(SHORT h), __REGD6(UBYTE minterm), __REGD7(UBYTE mask)) {
+void SetSpriteColor (__REGA0(struct BoardInfo *b), __REGD0(UBYTE idx), __REGD1(UBYTE R), __REGD2(UBYTE G), __REGD3(UBYTE B), __REGD7(RGBFTYPE format)) {
+  WRITEBYTE(RTG_U81, R);
+  WRITEBYTE(RTG_U82, G);
+  WRITEBYTE(RTG_U83, B);
+  WRITEBYTE(RTG_U84, idx);
 
+  WRITESHORT(RTG_COMMAND, RTGCMD_SETSPRITECOLOR);
 }