Fix iRTG BlitTemplate add iRTG BlitPattern support

[pistorm] / platforms / amiga / rtg / rtg.h

diff --git a/platforms/amiga/rtg/rtg.h b/platforms/amiga/rtg/rtg.h
index 0f08d1cd50febdcf310616e43a30e900ae80eab1..63decc79211a1d06d52d58dbd5d0acf4b239ad2e 100644 (file)
--- a/platforms/amiga/rtg/rtg.h
+++ b/platforms/amiga/rtg/rtg.h
@@ -9,7 +9,7 @@
 
 #define CARD_OFFSET 0
 
-#include "rtg_driver_amiga/rtg_enums.h"
+#include "rtg_enums.h"
 
 void rtg_write(uint32_t address, uint32_t value, uint8_t mode);
 unsigned int rtg_read(uint32_t address, uint8_t mode);
@@ -44,23 +44,31 @@ void rtg_p2c (int16_t sx, int16_t sy, int16_t dx, int16_t dy, int16_t w, int16_t
 void rtg_p2d (int16_t sx, int16_t sy, int16_t dx, int16_t dy, int16_t w, int16_t h, uint8_t draw_mode, uint8_t planes, uint8_t mask, uint8_t layer_mask, uint16_t src_line_pitch, uint8_t *bmp_data_src);
 
 #define PATTERN_LOOPX \
-    tmpl_x ^= 0x01; \
-    cur_byte = (invert) ? sptr[tmpl_x] ^ 0xFF : sptr[tmpl_x]; \
+    if (sptr)   { cur_byte = sptr[tmpl_x]; } \
+    else        { cur_byte = m68k_read_memory_8(src_addr + tmpl_x); } \
+    if (invert) { cur_byte ^= 0xFF; } \
+    tmpl_x ^= 0x01;
 
 #define PATTERN_LOOPY \
        sptr += 2 ; \
-       if ((ys + offset_y + 1) % loop_rows == 0) \
-               sptr = sptr_base; \
+    src_addr += 2; \
+       if ((ys + offset_y + 1) % loop_rows == 0) { \
+               if (sptr) sptr = sptr_base; \
+        src_addr = src_addr_base; \
+    } \
        tmpl_x = (offset_x / 8) % 2; \
        cur_bit = base_bit; \
        dptr += pitch;
 
 #define TEMPLATE_LOOPX \
-    tmpl_x++; \
-    cur_byte = (invert) ? sptr[tmpl_x] ^ 0xFF : sptr[tmpl_x]; \
+    if (sptr)   { cur_byte = sptr[tmpl_x]; } \
+    else        { cur_byte = m68k_read_memory_8(src_addr + tmpl_x); } \
+    if (invert) { cur_byte ^= 0xFF; } \
+    tmpl_x++;
 
 #define TEMPLATE_LOOPY \
-    sptr += t_pitch; \
+    if (sptr) sptr += t_pitch; \
+    src_addr += t_pitch; \
     dptr += pitch; \
     tmpl_x = offset_x / 8; \
     cur_bit = base_bit;