Genlock transparency data (PIXELSW).

diff --git a/custom.cpp b/custom.cpp
index 8f60acf4e55e557c3fa6294a2be2425c9d27bd48..784b66c977c5effcf21068e6015af42f4baa9b32 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -4001,14 +4001,14 @@ void compute_framesync (void)
 }
 
 /* set PAL/NTSC or custom timing variables */
-void init_hz (bool fullinit)
+static void init_hz (bool checkvposw)
 {
        int isntsc, islace;
        int odbl = doublescan, omaxvpos = maxvpos;
        double ovblank = vblank_hz;
        int hzc = 0;
 
-       if (fullinit)
+       if (!checkvposw)
                vpos_count = 0;
 
        vpos_count_diff = vpos_count;
@@ -4211,18 +4211,15 @@ void init_hz (bool fullinit)
                varsync_changed = false;
                dumpsync ();
        }
-
-       if (fullinit)
-               vpos_count_diff = maxvpos_nom;
 }
 
-void init_hz (void)
+static void init_hz_vposw (void)
 {
-       init_hz (false);
+       init_hz (true);
 }
-void init_hz_full (void)
+void init_hz_normal (void)
 {
-       init_hz (true);
+       init_hz (false);
 }
 
 static void calcdiw (void)
@@ -4279,11 +4276,11 @@ static void calcdiw (void)
 /* display mode changed (lores, doubling etc..), recalculate everything */
 void init_custom (void)
 {
-       update_mirrors ();
-       create_cycle_diagram_table ();
-       reset_drawing ();
-       init_hz ();
-       calcdiw ();
+       update_mirrors();
+       create_cycle_diagram_table();
+       reset_drawing();
+       init_hz_normal();
+       calcdiw();
 }
 
 static int timehack_alive = 0;
@@ -7434,9 +7431,9 @@ static void vsync_handler_post (void)
        devices_vsync_post();
 
        if (varsync_changed || (beamcon0 & (0x10 | 0x20 | 0x80 | 0x100 | 0x200)) != (new_beamcon0 & (0x10 | 0x20 | 0x80 | 0x100 | 0x200))) {
-               init_hz ();
+               init_hz_normal();
        } else if (vpos_count > 0 && abs (vpos_count - vpos_count_diff) > 1 && vposw_change < 4) {
-               init_hz ();
+               init_hz_vposw();
        } else if (interlace_changed || changed_chipset_refresh () || lof_changed) {
                compute_framesync ();
        }
@@ -7472,7 +7469,7 @@ static void copper_check (int n)
 4 4 -
 5 5 --
 
-0 x -
+0 x -+
 1 0 --
 2 1 -
 3 2 --
@@ -7487,7 +7484,7 @@ static void hsync_scandoubler (void)
        struct draw_info *dip1;
        uaecptr bpltmp[8], bpltmpx[8];
 
-       if (vpos >= maxvpos - 1)
+       if (lof_store && vpos >= maxvpos_nom - 1)
                return;
 
        next_lineno++;
@@ -8232,7 +8229,7 @@ void custom_reset (bool hardreset, bool keyboardreset)
        }
 
        devices_reset(hardreset);
-       specialmonitor_store_fmode(-1, -1, 0);
+       specialmonitor_reset();
 
        unset_special (~(SPCFLAG_BRK | SPCFLAG_MODE_CHANGE));
 
@@ -8258,7 +8255,7 @@ void custom_reset (bool hardreset, bool keyboardreset)
        diwstate = DIW_waiting_start;
 
        dmal = 0;
-       init_hz_full ();
+       init_hz_normal();
        vpos_lpen = -1;
        lof_changing = 0;
        lof_togglecnt_nlace = lof_togglecnt_lace = 0;

diff --git a/drawing.cpp b/drawing.cpp
index e73c725451758fbcbd450bc7c1758838e875e8a7..c09adea6589eeb4e24db77df0cb9278d93e77fbd 100644 (file)
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -87,6 +87,7 @@ int interlace_seen = 0;
 static int can_use_lores = 0, frame_res, frame_res_lace;
 static int resolution_count[RES_MAX + 1], lines_count;
 static bool center_reset;
+static bool need_genlock_data, init_genlock_data;
 
 /* Lookup tables for dual playfields.  The dblpf_*1 versions are for the case
 that playfield 1 has the priority, dbplpf_*2 are used if playfield 2 has
@@ -164,12 +165,14 @@ static uae_u8 *real_bplpt[8];
 static uae_u8 all_ones[MAX_PIXELS_PER_LINE];
 static uae_u8 all_zeros[MAX_PIXELS_PER_LINE];
 
-uae_u8 *xlinebuffer;
+uae_u8 *xlinebuffer, *xlinebuffer_genlock;
 
 static int *amiga2aspect_line_map, *native2amiga_line_map;
 static uae_u8 **row_map;
+static uae_u8 *row_map_genlock_buffer;
 static uae_u8 row_tmp[MAX_PIXELS_PER_LINE * 32 / 8];
 static int max_drawn_amiga_line;
+uae_u8 **row_map_genlock;
 
 /* line_draw_funcs: pfield_do_linetoscr, pfield_do_fill_line, decode_ham */
 typedef void (*line_draw_func)(int, int, bool);
@@ -201,7 +204,7 @@ static int visible_top_start, visible_bottom_stop;
 /* same for hblank */
 static int hblank_left_start, hblank_right_stop;
 
-static int linetoscr_x_adjust_bytes;
+static int linetoscr_x_adjust_pixbytes, linetoscr_x_adjust_pixels;
 static int thisframe_y_adjust;
 static int thisframe_y_adjust_real, max_ypos_thisframe, min_ypos_for_screen;
 int thisframe_first_drawn_line, thisframe_last_drawn_line;
@@ -1034,12 +1037,16 @@ STATIC_INLINE void fill_line_32 (uae_u8 *buf, int start, int stop, bool blank)
        for (i = start; i < stop; i++)
                b[i] = col;
 }
+
 static void pfield_do_fill_line (int start, int stop, bool blank)
 {
        switch (gfxvidinfo.drawbuffer.pixbytes) {
        case 2: fill_line_16 (xlinebuffer, start, stop, blank); break;
        case 4: fill_line_32 (xlinebuffer, start, stop, blank); break;
        }
+       if (need_genlock_data) {
+               memset(xlinebuffer_genlock + start, 0, stop - start);
+       }
 }
 
 static void fill_line2 (int startpos, int len)
@@ -1098,6 +1105,9 @@ static void fill_line_border (int lineno)
                int b = hposblank;
                hposblank = 3;
                fill_line2(lastpos, gfxvidinfo.drawbuffer.inwidth);
+               if (need_genlock_data) {
+                       memset(xlinebuffer_genlock + lastpos, 0, gfxvidinfo.drawbuffer.inwidth);
+               }
                hposblank = b;
                return;
        }
@@ -1106,11 +1116,17 @@ static void fill_line_border (int lineno)
        if (hposblank) {
                hposblank = 3;
                fill_line2(lastpos, gfxvidinfo.drawbuffer.inwidth);
+               if (need_genlock_data) {
+                       memset(xlinebuffer_genlock + lastpos, 0, gfxvidinfo.drawbuffer.inwidth);
+               }
                return;
        }
        // hblank not visible
        if (hblank_left_start <= lastpos && hblank_right_stop >= endpos) {
                fill_line2(lastpos, gfxvidinfo.drawbuffer.inwidth);
+               if (need_genlock_data) {
+                       memset(xlinebuffer_genlock + lastpos, 0, gfxvidinfo.drawbuffer.inwidth);
+               }
                return;
        }
 
@@ -1463,184 +1479,333 @@ static void pfield_do_linetoscr (int start, int stop, bool blank)
        xlinecheck(start, stop);
 #ifdef AGA
        if (issprites && (currprefs.chipset_mask & CSMASK_AGA)) {
-               if (res_shift == 0) {
-                       switch (gfxvidinfo.drawbuffer.pixbytes) {
-                       case 2: src_pixel = linetoscr_16_aga_spr (LTPARMS); break;
-                       case 4: src_pixel = linetoscr_32_aga_spr (LTPARMS); break;
-                       }
-               } else if (res_shift == 2) {
-                       switch (gfxvidinfo.drawbuffer.pixbytes) {
-                       case 2: src_pixel = linetoscr_16_stretch2_aga_spr (LTPARMS); break;
-                       case 4: src_pixel = linetoscr_32_stretch2_aga_spr (LTPARMS); break;
-                       }
-               } else if (res_shift == 1) {
-                       switch (gfxvidinfo.drawbuffer.pixbytes) {
-                       case 2: src_pixel = linetoscr_16_stretch1_aga_spr (LTPARMS); break;
-                       case 4: src_pixel = linetoscr_32_stretch1_aga_spr (LTPARMS); break;
-                       }
-               } else if (res_shift == -1) {
-                       if (currprefs.gfx_lores_mode) {
+               if (need_genlock_data) {
+                       if (res_shift == 0) {
                                switch (gfxvidinfo.drawbuffer.pixbytes) {
-                               case 2: src_pixel = linetoscr_16_shrink1f_aga_spr (LTPARMS); break;
-                               case 4: src_pixel = linetoscr_32_shrink1f_aga_spr (LTPARMS); break;
+                                       case 2: src_pixel = linetoscr_16_aga_spr_genlock(LTPARMS); break;
+                                       case 4: src_pixel = linetoscr_32_aga_spr_genlock(LTPARMS); break;
                                }
-                       } else {
+                       } else if (res_shift == 2) {
                                switch (gfxvidinfo.drawbuffer.pixbytes) {
-                               case 2: src_pixel = linetoscr_16_shrink1_aga_spr (LTPARMS); break;
-                               case 4: src_pixel = linetoscr_32_shrink1_aga_spr (LTPARMS); break;
+                                       case 2: src_pixel = linetoscr_16_stretch2_aga_spr_genlock(LTPARMS); break;
+                                       case 4: src_pixel = linetoscr_32_stretch2_aga_spr_genlock(LTPARMS); break;
                                }
-                       }
-               } else if (res_shift == -2) {
-                       if (currprefs.gfx_lores_mode) {
+                       } else if (res_shift == 1) {
                                switch (gfxvidinfo.drawbuffer.pixbytes) {
-                               case 2: src_pixel = linetoscr_16_shrink2f_aga_spr (LTPARMS); break;
-                               case 4: src_pixel = linetoscr_32_shrink2f_aga_spr (LTPARMS); break;
+                                       case 2: src_pixel = linetoscr_16_stretch1_aga_spr_genlock(LTPARMS); break;
+                                       case 4: src_pixel = linetoscr_32_stretch1_aga_spr_genlock(LTPARMS); break;
                                }
-                       } else {
-                               switch (gfxvidinfo.drawbuffer.pixbytes) {
-                               case 2: src_pixel = linetoscr_16_shrink2_aga_spr (LTPARMS); break;
-                               case 4: src_pixel = linetoscr_32_shrink2_aga_spr (LTPARMS); break;
+                       } else if (res_shift == -1) {
+                               if (currprefs.gfx_lores_mode) {
+                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                               case 2: src_pixel = linetoscr_16_shrink1f_aga_spr_genlock(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_shrink1f_aga_spr_genlock(LTPARMS); break;
+                                       }
+                               } else {
+                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                               case 2: src_pixel = linetoscr_16_shrink1_aga_spr_genlock(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_shrink1_aga_spr_genlock(LTPARMS); break;
+                                       }
+                               }
+                       } else if (res_shift == -2) {
+                               if (currprefs.gfx_lores_mode) {
+                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                               case 2: src_pixel = linetoscr_16_shrink2f_aga_spr_genlock(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_shrink2f_aga_spr_genlock(LTPARMS); break;
+                                       }
+                               } else {
+                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                               case 2: src_pixel = linetoscr_16_shrink2_aga_spr_genlock(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_shrink2_aga_spr_genlock(LTPARMS); break;
+                                       }
                                }
                        }
-               }
-       } else
-               if (currprefs.chipset_mask & CSMASK_AGA) {
+               } else {
                        if (res_shift == 0) {
                                switch (gfxvidinfo.drawbuffer.pixbytes) {
-                               case 2: src_pixel = linetoscr_16_aga (LTPARMS); break;
-                               case 4: src_pixel = linetoscr_32_aga (LTPARMS); break;
+                                       case 2: src_pixel = linetoscr_16_aga_spr(LTPARMS); break;
+                                       case 4: src_pixel = linetoscr_32_aga_spr(LTPARMS); break;
                                }
                        } else if (res_shift == 2) {
                                switch (gfxvidinfo.drawbuffer.pixbytes) {
-                               case 2: src_pixel = linetoscr_16_stretch2_aga (LTPARMS); break;
-                               case 4: src_pixel = linetoscr_32_stretch2_aga (LTPARMS); break;
+                                       case 2: src_pixel = linetoscr_16_stretch2_aga_spr(LTPARMS); break;
+                                       case 4: src_pixel = linetoscr_32_stretch2_aga_spr(LTPARMS); break;
                                }
                        } else if (res_shift == 1) {
                                switch (gfxvidinfo.drawbuffer.pixbytes) {
-                               case 2: src_pixel = linetoscr_16_stretch1_aga (LTPARMS); break;
-                               case 4: src_pixel = linetoscr_32_stretch1_aga (LTPARMS); break;
+                                       case 2: src_pixel = linetoscr_16_stretch1_aga_spr(LTPARMS); break;
+                                       case 4: src_pixel = linetoscr_32_stretch1_aga_spr(LTPARMS); break;
                                }
                        } else if (res_shift == -1) {
                                if (currprefs.gfx_lores_mode) {
                                        switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                       case 2: src_pixel = linetoscr_16_shrink1f_aga (LTPARMS); break;
-                                       case 4: src_pixel = linetoscr_32_shrink1f_aga (LTPARMS); break;
+                                               case 2: src_pixel = linetoscr_16_shrink1f_aga_spr(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_shrink1f_aga_spr(LTPARMS); break;
                                        }
                                } else {
                                        switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                       case 2: src_pixel = linetoscr_16_shrink1_aga (LTPARMS); break;
-                                       case 4: src_pixel = linetoscr_32_shrink1_aga (LTPARMS); break;
+                                               case 2: src_pixel = linetoscr_16_shrink1_aga_spr(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_shrink1_aga_spr(LTPARMS); break;
                                        }
                                }
                        } else if (res_shift == -2) {
                                if (currprefs.gfx_lores_mode) {
                                        switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                       case 2: src_pixel = linetoscr_16_shrink2f_aga (LTPARMS); break;
-                                       case 4: src_pixel = linetoscr_32_shrink2f_aga (LTPARMS); break;
+                                               case 2: src_pixel = linetoscr_16_shrink2f_aga_spr(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_shrink2f_aga_spr(LTPARMS); break;
                                        }
                                } else {
                                        switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                       case 2: src_pixel = linetoscr_16_shrink2_aga (LTPARMS); break;
-                                       case 4: src_pixel = linetoscr_32_shrink2_aga (LTPARMS); break;
+                                               case 2: src_pixel = linetoscr_16_shrink2_aga_spr(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_shrink2_aga_spr(LTPARMS); break;
                                        }
                                }
                        }
-               } else
-#endif
-#ifdef ECS_DENISE
-                       if (ecsshres) {
+               }
+       } else {
+               if (currprefs.chipset_mask & CSMASK_AGA) {
+                       if (need_genlock_data) {
                                if (res_shift == 0) {
                                        switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                       case 2: src_pixel = linetoscr_16_sh (LTPARMS, issprites); break;
-                                       case 4: src_pixel = linetoscr_32_sh (LTPARMS, issprites); break;
+                                               case 2: src_pixel = linetoscr_16_aga_genlock(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_aga_genlock(LTPARMS); break;
+                                       }
+                               } else if (res_shift == 2) {
+                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                               case 2: src_pixel = linetoscr_16_stretch2_aga_genlock(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_stretch2_aga_genlock(LTPARMS); break;
+                                       }
+                               } else if (res_shift == 1) {
+                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                               case 2: src_pixel = linetoscr_16_stretch1_aga_genlock(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_stretch1_aga_genlock(LTPARMS); break;
                                        }
                                } else if (res_shift == -1) {
                                        if (currprefs.gfx_lores_mode) {
                                                switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                               case 2: src_pixel = linetoscr_16_shrink1f_sh (LTPARMS, issprites); break;
-                                               case 4: src_pixel = linetoscr_32_shrink1f_sh (LTPARMS, issprites); break;
+                                                       case 2: src_pixel = linetoscr_16_shrink1f_aga_genlock(LTPARMS); break;
+                                                       case 4: src_pixel = linetoscr_32_shrink1f_aga_genlock(LTPARMS); break;
                                                }
                                        } else {
                                                switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                               case 2: src_pixel = linetoscr_16_shrink1_sh (LTPARMS, issprites); break;
-                                               case 4: src_pixel = linetoscr_32_shrink1_sh (LTPARMS, issprites); break;
+                                                       case 2: src_pixel = linetoscr_16_shrink1_aga_genlock(LTPARMS); break;
+                                                       case 4: src_pixel = linetoscr_32_shrink1_aga_genlock(LTPARMS); break;
                                                }
                                        }
                                } else if (res_shift == -2) {
                                        if (currprefs.gfx_lores_mode) {
                                                switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                               case 2: src_pixel = linetoscr_16_shrink2f_sh (LTPARMS, issprites); break;
-                                               case 4: src_pixel = linetoscr_32_shrink2f_sh (LTPARMS, issprites); break;
+                                                       case 2: src_pixel = linetoscr_16_shrink2f_aga_genlock(LTPARMS); break;
+                                                       case 4: src_pixel = linetoscr_32_shrink2f_aga_genlock(LTPARMS); break;
                                                }
                                        } else {
                                                switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                               case 2: src_pixel = linetoscr_16_shrink2_sh (LTPARMS, issprites); break;
-                                               case 4: src_pixel = linetoscr_32_shrink2_sh (LTPARMS, issprites); break;
+                                                       case 2: src_pixel = linetoscr_16_shrink2_aga_genlock(LTPARMS); break;
+                                                       case 4: src_pixel = linetoscr_32_shrink2_aga_genlock(LTPARMS); break;
                                                }
                                        }
                                }
-                       } else
+                       } else {
+                               if (res_shift == 0) {
+                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                               case 2: src_pixel = linetoscr_16_aga(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_aga(LTPARMS); break;
+                                       }
+                               } else if (res_shift == 2) {
+                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                               case 2: src_pixel = linetoscr_16_stretch2_aga(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_stretch2_aga(LTPARMS); break;
+                                       }
+                               } else if (res_shift == 1) {
+                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                               case 2: src_pixel = linetoscr_16_stretch1_aga(LTPARMS); break;
+                                               case 4: src_pixel = linetoscr_32_stretch1_aga(LTPARMS); break;
+                                       }
+                               } else if (res_shift == -1) {
+                                       if (currprefs.gfx_lores_mode) {
+                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                       case 2: src_pixel = linetoscr_16_shrink1f_aga(LTPARMS); break;
+                                                       case 4: src_pixel = linetoscr_32_shrink1f_aga(LTPARMS); break;
+                                               }
+                                       } else {
+                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                       case 2: src_pixel = linetoscr_16_shrink1_aga(LTPARMS); break;
+                                                       case 4: src_pixel = linetoscr_32_shrink1_aga(LTPARMS); break;
+                                               }
+                                       }
+                               } else if (res_shift == -2) {
+                                       if (currprefs.gfx_lores_mode) {
+                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                       case 2: src_pixel = linetoscr_16_shrink2f_aga(LTPARMS); break;
+                                                       case 4: src_pixel = linetoscr_32_shrink2f_aga(LTPARMS); break;
+                                               }
+                                       } else {
+                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                       case 2: src_pixel = linetoscr_16_shrink2_aga(LTPARMS); break;
+                                                       case 4: src_pixel = linetoscr_32_shrink2_aga(LTPARMS); break;
+                                               }
+                                       }
+                               }
+                       }
+               } else
 #endif
-                               if (issprites) {
-                                       if (res_shift == 0) {
+#ifdef ECS_DENISE
+                       if (ecsshres) {
+                               if (res_shift == 0) {
+                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                               case 2: src_pixel = linetoscr_16_sh(LTPARMS, issprites); break;
+                                               case 4: src_pixel = linetoscr_32_sh(LTPARMS, issprites); break;
+                                       }
+                               } else if (res_shift == -1) {
+                                       if (currprefs.gfx_lores_mode) {
                                                switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                               case 2: src_pixel = linetoscr_16_spr (LTPARMS); break;
-                                               case 4: src_pixel = linetoscr_32_spr (LTPARMS); break;
+                                                       case 2: src_pixel = linetoscr_16_shrink1f_sh(LTPARMS, issprites); break;
+                                                       case 4: src_pixel = linetoscr_32_shrink1f_sh(LTPARMS, issprites); break;
                                                }
-                                       } else if (res_shift == 2) {
+                                       } else {
                                                switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                               case 2: src_pixel = linetoscr_16_stretch2_spr (LTPARMS); break;
-                                               case 4: src_pixel = linetoscr_32_stretch2_spr (LTPARMS); break;
+                                                       case 2: src_pixel = linetoscr_16_shrink1_sh(LTPARMS, issprites); break;
+                                                       case 4: src_pixel = linetoscr_32_shrink1_sh(LTPARMS, issprites); break;
                                                }
-                                       } else if (res_shift == 1) {
+                                       }
+                               } else if (res_shift == -2) {
+                                       if (currprefs.gfx_lores_mode) {
+                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                       case 2: src_pixel = linetoscr_16_shrink2f_sh(LTPARMS, issprites); break;
+                                                       case 4: src_pixel = linetoscr_32_shrink2f_sh(LTPARMS, issprites); break;
+                                               }
+                                       } else {
                                                switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                               case 2: src_pixel = linetoscr_16_stretch1_spr (LTPARMS); break;
-                                               case 4: src_pixel = linetoscr_32_stretch1_spr (LTPARMS); break;
+                                                       case 2: src_pixel = linetoscr_16_shrink2_sh(LTPARMS, issprites); break;
+                                                       case 4: src_pixel = linetoscr_32_shrink2_sh(LTPARMS, issprites); break;
                                                }
-                                       } else if (res_shift == -1) {
-                                               if (currprefs.gfx_lores_mode) {
+                                       }
+                               }
+                       } else {
+#endif
+                               if (issprites) {
+                                       if (need_genlock_data) {
+                                               if (res_shift == 0) {
+                                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                               case 2: src_pixel = linetoscr_16_spr_genlock(LTPARMS); break;
+                                                               case 4: src_pixel = linetoscr_32_spr_genlock(LTPARMS); break;
+                                                       }
+                                               } else if (res_shift == 2) {
+                                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                               case 2: src_pixel = linetoscr_16_stretch2_spr_genlock(LTPARMS); break;
+                                                               case 4: src_pixel = linetoscr_32_stretch2_spr_genlock(LTPARMS); break;
+                                                       }
+                                               } else if (res_shift == 1) {
+                                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                               case 2: src_pixel = linetoscr_16_stretch1_spr_genlock(LTPARMS); break;
+                                                               case 4: src_pixel = linetoscr_32_stretch1_spr_genlock(LTPARMS); break;
+                                                       }
+                                               } else if (res_shift == -1) {
+                                                       if (currprefs.gfx_lores_mode) {
+                                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                                       case 2: src_pixel = linetoscr_16_shrink1f_spr_genlock(LTPARMS); break;
+                                                                       case 4: src_pixel = linetoscr_32_shrink1f_spr_genlock(LTPARMS); break;
+                                                               }
+                                                       } else {
+                                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                                       case 2: src_pixel = linetoscr_16_shrink1_spr_genlock(LTPARMS); break;
+                                                                       case 4: src_pixel = linetoscr_32_shrink1_spr_genlock(LTPARMS); break;
+                                                               }
+                                                       }
+                                               }
+                                       } else {
+                                               if (res_shift == 0) {
+                                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                               case 2: src_pixel = linetoscr_16_spr(LTPARMS); break;
+                                                               case 4: src_pixel = linetoscr_32_spr(LTPARMS); break;
+                                                       }
+                                               } else if (res_shift == 2) {
                                                        switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                                       case 2: src_pixel = linetoscr_16_shrink1f_spr (LTPARMS); break;
-                                                       case 4: src_pixel = linetoscr_32_shrink1f_spr (LTPARMS); break;
+                                                               case 2: src_pixel = linetoscr_16_stretch2_spr(LTPARMS); break;
+                                                               case 4: src_pixel = linetoscr_32_stretch2_spr(LTPARMS); break;
                                                        }
-                                               } else {
+                                               } else if (res_shift == 1) {
                                                        switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                                       case 2: src_pixel = linetoscr_16_shrink1_spr (LTPARMS); break;
-                                                       case 4: src_pixel = linetoscr_32_shrink1_spr (LTPARMS); break;
+                                                               case 2: src_pixel = linetoscr_16_stretch1_spr(LTPARMS); break;
+                                                               case 4: src_pixel = linetoscr_32_stretch1_spr(LTPARMS); break;
+                                                       }
+                                               } else if (res_shift == -1) {
+                                                       if (currprefs.gfx_lores_mode) {
+                                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                                       case 2: src_pixel = linetoscr_16_shrink1f_spr(LTPARMS); break;
+                                                                       case 4: src_pixel = linetoscr_32_shrink1f_spr(LTPARMS); break;
+                                                               }
+                                                       } else {
+                                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                                       case 2: src_pixel = linetoscr_16_shrink1_spr(LTPARMS); break;
+                                                                       case 4: src_pixel = linetoscr_32_shrink1_spr(LTPARMS); break;
+                                                               }
                                                        }
                                                }
                                        }
                                } else {
-                                       if (res_shift == 0) {
-                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                               case 2: src_pixel = linetoscr_16 (LTPARMS); break;
-                                               case 4: src_pixel = linetoscr_32 (LTPARMS); break;
-                                               }
-                                       } else if (res_shift == 2) {
-                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                               case 2: src_pixel = linetoscr_16_stretch2 (LTPARMS); break;
-                                               case 4: src_pixel = linetoscr_32_stretch2 (LTPARMS); break;
-                                               }
-                                       } else if (res_shift == 1) {
-                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                               case 2: src_pixel = linetoscr_16_stretch1 (LTPARMS); break;
-                                               case 4: src_pixel = linetoscr_32_stretch1 (LTPARMS); break;
+                                       if (need_genlock_data) {
+                                               if (res_shift == 0) {
+                                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                               case 2: src_pixel = linetoscr_16_genlock(LTPARMS); break;
+                                                               case 4: src_pixel = linetoscr_32_genlock(LTPARMS); break;
+                                                       }
+                                               } else if (res_shift == 2) {
+                                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                               case 2: src_pixel = linetoscr_16_stretch2_genlock(LTPARMS); break;
+                                                               case 4: src_pixel = linetoscr_32_stretch2_genlock(LTPARMS); break;
+                                                       }
+                                               } else if (res_shift == 1) {
+                                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                               case 2: src_pixel = linetoscr_16_stretch1_genlock(LTPARMS); break;
+                                                               case 4: src_pixel = linetoscr_32_stretch1_genlock(LTPARMS); break;
+                                                       }
+                                               } else if (res_shift == -1) {
+                                                       if (currprefs.gfx_lores_mode) {
+                                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                                       case 2: src_pixel = linetoscr_16_shrink1f_genlock(LTPARMS); break;
+                                                                       case 4: src_pixel = linetoscr_32_shrink1f_genlock(LTPARMS); break;
+                                                               }
+                                                       } else {
+                                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                                       case 2: src_pixel = linetoscr_16_shrink1_genlock(LTPARMS); break;
+                                                                       case 4: src_pixel = linetoscr_32_shrink1_genlock(LTPARMS); break;
+                                                               }
+                                                       }
                                                }
-                                       } else if (res_shift == -1) {
-                                               if (currprefs.gfx_lores_mode) {
+                                       } else {
+                                               if (res_shift == 0) {
                                                        switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                                       case 2: src_pixel = linetoscr_16_shrink1f (LTPARMS); break;
-                                                       case 4: src_pixel = linetoscr_32_shrink1f (LTPARMS); break;
+                                                               case 2: src_pixel = linetoscr_16(LTPARMS); break;
+                                                               case 4: src_pixel = linetoscr_32(LTPARMS); break;
                                                        }
-                                               } else {
+                                               } else if (res_shift == 2) {
                                                        switch (gfxvidinfo.drawbuffer.pixbytes) {
-                                                       case 2: src_pixel = linetoscr_16_shrink1 (LTPARMS); break;
-                                                       case 4: src_pixel = linetoscr_32_shrink1 (LTPARMS); break;
+                                                               case 2: src_pixel = linetoscr_16_stretch2(LTPARMS); break;
+                                                               case 4: src_pixel = linetoscr_32_stretch2(LTPARMS); break;
+                                                       }
+                                               } else if (res_shift == 1) {
+                                                       switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                               case 2: src_pixel = linetoscr_16_stretch1(LTPARMS); break;
+                                                               case 4: src_pixel = linetoscr_32_stretch1(LTPARMS); break;
+                                                       }
+                                               } else if (res_shift == -1) {
+                                                       if (currprefs.gfx_lores_mode) {
+                                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                                       case 2: src_pixel = linetoscr_16_shrink1f(LTPARMS); break;
+                                                                       case 4: src_pixel = linetoscr_32_shrink1f(LTPARMS); break;
+                                                               }
+                                                       } else {
+                                                               switch (gfxvidinfo.drawbuffer.pixbytes) {
+                                                                       case 2: src_pixel = linetoscr_16_shrink1(LTPARMS); break;
+                                                                       case 4: src_pixel = linetoscr_32_shrink1(LTPARMS); break;
+                                                               }
                                                        }
                                                }
                                        }
                                }
-
+                       }
+               }
 }
 
 // left or right AGA border sprite
@@ -2110,27 +2275,45 @@ void init_row_map (void)
 {
        static uae_u8 *oldbufmem;
        static int oldheight, oldpitch;
+       static bool oldgenlock;
        int i, j;
 
        if (gfxvidinfo.drawbuffer.height_allocated > max_uae_height) {
                write_log (_T("Resolution too high, aborting\n"));
                abort ();
        }
-       if (!row_map)
-               row_map = xmalloc (uae_u8*, max_uae_height + 1);
+       if (!row_map) {
+               row_map = xmalloc(uae_u8*, max_uae_height + 1);
+               row_map_genlock = xmalloc(uae_u8*, max_uae_height + 1);
+       }
 
        if (oldbufmem && oldbufmem == gfxvidinfo.drawbuffer.bufmem &&
                oldheight == gfxvidinfo.drawbuffer.height_allocated &&
-               oldpitch == gfxvidinfo.drawbuffer.rowbytes)
+               oldpitch == gfxvidinfo.drawbuffer.rowbytes &&
+               oldgenlock == init_genlock_data)
                return;
+       xfree(row_map_genlock_buffer);
+       row_map_genlock_buffer = NULL;
+       if (init_genlock_data) {
+               row_map_genlock_buffer = xcalloc(uae_u8, gfxvidinfo.drawbuffer.width_allocated * (gfxvidinfo.drawbuffer.height_allocated + 2));
+       }
        j = oldheight == 0 ? max_uae_height : oldheight;
-       for (i = gfxvidinfo.drawbuffer.height_allocated; i < max_uae_height + 1 && i < j + 1; i++)
+       for (i = gfxvidinfo.drawbuffer.height_allocated; i < max_uae_height + 1 && i < j + 1; i++) {
                row_map[i] = row_tmp;
-       for (i = 0, j = 0; i < gfxvidinfo.drawbuffer.height_allocated; i++, j += gfxvidinfo.drawbuffer.rowbytes)
+               row_map_genlock[i] = row_tmp;
+       }
+       for (i = 0, j = 0; i < gfxvidinfo.drawbuffer.height_allocated; i++, j += gfxvidinfo.drawbuffer.rowbytes) {
                row_map[i] = gfxvidinfo.drawbuffer.bufmem + j;
+               if (init_genlock_data) {
+                       row_map_genlock[i] = row_map_genlock_buffer + gfxvidinfo.drawbuffer.width_allocated * (i + 1);
+               } else {
+                       row_map_genlock[i] = NULL;
+               }
+       }
        oldbufmem = gfxvidinfo.drawbuffer.bufmem;
        oldheight = gfxvidinfo.drawbuffer.height_allocated;
        oldpitch = gfxvidinfo.drawbuffer.rowbytes;
+       oldgenlock = init_genlock_data;
 }
 
 void init_aspect_maps (void)
@@ -2171,9 +2354,6 @@ void init_aspect_maps (void)
        }
        if (max_drawn_amiga_line < 0)
                max_drawn_amiga_line = maxl - min_ypos_for_screen;
-       if (max_drawn_amiga_line > gfxvidinfo.drawbuffer.inheight)
-               max_drawn_amiga_line = gfxvidinfo.drawbuffer.inheight;
-       max_drawn_amiga_line >>= linedbl;
 
        for (i = 0; i < h; i++)
                native2amiga_line_map[i] = -1;
@@ -2545,7 +2725,8 @@ static void pfield_draw_line (struct vidbuffer *vb, int lineno, int gfx_ypos, in
                xlinebuffer = gfxvidinfo.drawbuffer.emergmem, dh = dh_emerg;
        if (xlinebuffer == 0)
                xlinebuffer = row_map[gfx_ypos], dh = dh_buf;
-       xlinebuffer -= linetoscr_x_adjust_bytes;
+       xlinebuffer -= linetoscr_x_adjust_pixbytes;
+       xlinebuffer_genlock = row_map_genlock[gfx_ypos] - linetoscr_x_adjust_pixels;
 
        if (border == 0) {
 
@@ -2595,14 +2776,16 @@ static void pfield_draw_line (struct vidbuffer *vb, int lineno, int gfx_ypos, in
                        do_color_changes (pfield_do_fill_line, pfield_do_linetoscr, lineno);
 
                if (dh == dh_emerg)
-                       memcpy (row_map[gfx_ypos], xlinebuffer + linetoscr_x_adjust_bytes, gfxvidinfo.drawbuffer.pixbytes * gfxvidinfo.drawbuffer.inwidth);
+                       memcpy (row_map[gfx_ypos], xlinebuffer + linetoscr_x_adjust_pixbytes, gfxvidinfo.drawbuffer.pixbytes * gfxvidinfo.drawbuffer.inwidth);
 
                do_flush_line (vb, gfx_ypos);
                if (do_double) {
                        if (dh == dh_emerg)
-                               memcpy (row_map[follow_ypos], xlinebuffer + linetoscr_x_adjust_bytes, gfxvidinfo.drawbuffer.pixbytes * gfxvidinfo.drawbuffer.inwidth);
+                               memcpy (row_map[follow_ypos], xlinebuffer + linetoscr_x_adjust_pixbytes, gfxvidinfo.drawbuffer.pixbytes * gfxvidinfo.drawbuffer.inwidth);
                        else if (dh == dh_buf)
                                memcpy (row_map[follow_ypos], row_map[gfx_ypos], gfxvidinfo.drawbuffer.pixbytes * gfxvidinfo.drawbuffer.inwidth);
+                       if (need_genlock_data)
+                               memcpy(row_map_genlock[follow_ypos], row_map_genlock[gfx_ypos], gfxvidinfo.drawbuffer.inwidth);
                        do_flush_line (vb, follow_ypos);
                }
 
@@ -2639,7 +2822,8 @@ static void pfield_draw_line (struct vidbuffer *vb, int lineno, int gfx_ypos, in
                        do_flush_line (vb, gfx_ypos);
                        if (do_double) {
                                if (dh == dh_buf) {
-                                       xlinebuffer = row_map[follow_ypos] - linetoscr_x_adjust_bytes;
+                                       xlinebuffer = row_map[follow_ypos] - linetoscr_x_adjust_pixbytes;
+                                       xlinebuffer_genlock = row_map_genlock[follow_ypos] - linetoscr_x_adjust_pixels;
                                        fill_line_border(lineno);
                                }
                                /* If dh == dh_line, do_flush_line will re-use the rendered line
@@ -2668,14 +2852,16 @@ static void pfield_draw_line (struct vidbuffer *vb, int lineno, int gfx_ypos, in
                }
 
                if (dh == dh_emerg)
-                       memcpy (row_map[gfx_ypos], xlinebuffer + linetoscr_x_adjust_bytes, gfxvidinfo.drawbuffer.pixbytes * gfxvidinfo.drawbuffer.inwidth);
+                       memcpy (row_map[gfx_ypos], xlinebuffer + linetoscr_x_adjust_pixbytes, gfxvidinfo.drawbuffer.pixbytes * gfxvidinfo.drawbuffer.inwidth);
                do_flush_line (vb, gfx_ypos);
                if (do_double) {
                        if (dh == dh_emerg)
-                               memcpy (row_map[follow_ypos], xlinebuffer + linetoscr_x_adjust_bytes, gfxvidinfo.drawbuffer.pixbytes * gfxvidinfo.drawbuffer.inwidth);
+                               memcpy (row_map[follow_ypos], xlinebuffer + linetoscr_x_adjust_pixbytes, gfxvidinfo.drawbuffer.pixbytes * gfxvidinfo.drawbuffer.inwidth);
                        else if (dh == dh_buf)
                                memcpy (row_map[follow_ypos], row_map[gfx_ypos], gfxvidinfo.drawbuffer.pixbytes * gfxvidinfo.drawbuffer.inwidth);
-                       do_flush_line (vb, follow_ypos);
+                       if (need_genlock_data)
+                               memcpy(row_map_genlock[follow_ypos], row_map_genlock[gfx_ypos], gfxvidinfo.drawbuffer.inwidth);
+                       do_flush_line(vb, follow_ypos);
                }
 
        } else {
@@ -2733,24 +2919,30 @@ static void center_image (void)
 
        //write_log (_T("%d %d %d %d %d\n"), max_diwlastword, gfxvidinfo.drawbuffer.width, lores_shift, currprefs.gfx_resolution, visible_left_border);
 
-       linetoscr_x_adjust_bytes = visible_left_border * gfxvidinfo.drawbuffer.pixbytes;
+       linetoscr_x_adjust_pixels = visible_left_border;
+       linetoscr_x_adjust_pixbytes = linetoscr_x_adjust_pixels * gfxvidinfo.drawbuffer.pixbytes;
 
        visible_right_border = visible_left_border + w;
        if (visible_right_border > max_diwlastword)
                visible_right_border = max_diwlastword;
 
+       int max_drawn_amiga_line_tmp = max_drawn_amiga_line;
+       if (max_drawn_amiga_line_tmp > gfxvidinfo.drawbuffer.inheight)
+               max_drawn_amiga_line_tmp = gfxvidinfo.drawbuffer.inheight;
+       max_drawn_amiga_line_tmp >>= linedbl;
+       
        thisframe_y_adjust = minfirstline;
        if (currprefs.gfx_ycenter && thisframe_first_drawn_line >= 0 && !currprefs.gf[0].gfx_filter_autoscale) {
 
-               if (thisframe_last_drawn_line - thisframe_first_drawn_line < max_drawn_amiga_line && currprefs.gfx_ycenter == 2)
-                       thisframe_y_adjust = (thisframe_last_drawn_line - thisframe_first_drawn_line - max_drawn_amiga_line) / 2 + thisframe_first_drawn_line;
+               if (thisframe_last_drawn_line - thisframe_first_drawn_line < max_drawn_amiga_line_tmp && currprefs.gfx_ycenter == 2)
+                       thisframe_y_adjust = (thisframe_last_drawn_line - thisframe_first_drawn_line - max_drawn_amiga_line_tmp) / 2 + thisframe_first_drawn_line;
                else
                        thisframe_y_adjust = thisframe_first_drawn_line;
 #if 1
                /* Would the old value be good enough? If so, leave it as it is if we want to be clever. */
                if (!center_reset && !horizontal_changed) {
                        if (currprefs.gfx_ycenter == 2 && thisframe_y_adjust != prev_y_adjust) {
-                               if (prev_y_adjust <= thisframe_first_drawn_line && prev_y_adjust + max_drawn_amiga_line > thisframe_last_drawn_line)
+                               if (prev_y_adjust <= thisframe_first_drawn_line && prev_y_adjust + max_drawn_amiga_line_tmp > thisframe_last_drawn_line)
                                        thisframe_y_adjust = prev_y_adjust;
                        }
                }
@@ -2758,8 +2950,8 @@ static void center_image (void)
        }
 
        /* Make sure the value makes sense */
-       if (thisframe_y_adjust + max_drawn_amiga_line > maxvpos + maxvpos / 2)
-               thisframe_y_adjust = maxvpos + maxvpos / 2 - max_drawn_amiga_line;
+       if (thisframe_y_adjust + max_drawn_amiga_line_tmp > maxvpos + maxvpos / 2)
+               thisframe_y_adjust = maxvpos + maxvpos / 2 - max_drawn_amiga_line_tmp;
        if (thisframe_y_adjust < 0)
                thisframe_y_adjust = 0;
 
@@ -2787,10 +2979,7 @@ static void init_drawing_frame (void)
        int i, maxline;
        static int frame_res_old;
 
-       if (currprefs.gfx_resolution != changed_prefs.gfx_resolution)
-               return;
-
-       if (lines_count > 0) {
+       if (currprefs.gfx_resolution == changed_prefs.gfx_resolution && lines_count > 0) {
                int largest_count = 0;
                int largest_count_res = 0;
                int largest_res = 0;
@@ -3025,6 +3214,7 @@ static uae_u8 *status_line_ptr(int line)
        xlinebuffer = gfxvidinfo.drawbuffer.linemem;
        if (xlinebuffer == 0)
                xlinebuffer = row_map[line];
+       xlinebuffer_genlock = row_map_genlock[line];
        return xlinebuffer;
 }
 
@@ -3044,7 +3234,8 @@ static void draw_debug_status_line (int line)
        xlinebuffer = gfxvidinfo.drawbuffer.linemem;
        if (xlinebuffer == 0)
                xlinebuffer = row_map[line];
-       debug_draw_cycles (xlinebuffer, gfxvidinfo.drawbuffer.pixbytes, line, gfxvidinfo.drawbuffer.outwidth, gfxvidinfo.drawbuffer.outheight, xredcolors, xgreencolors, xbluecolors);
+       xlinebuffer_genlock = row_map_genlock[line];
+       debug_draw_cycles(xlinebuffer, gfxvidinfo.drawbuffer.pixbytes, line, gfxvidinfo.drawbuffer.outwidth, gfxvidinfo.drawbuffer.outheight, xredcolors, xgreencolors, xbluecolors);
 }
 
 #define LIGHTPEN_HEIGHT 12
@@ -3075,6 +3266,7 @@ static void draw_lightpen_cursor (int x, int y, int line, int onscreen)
        xlinebuffer = gfxvidinfo.drawbuffer.linemem;
        if (xlinebuffer == 0)
                xlinebuffer = row_map[line];
+       xlinebuffer_genlock = row_map_genlock[line];
 
        p = lightpen_cursor + y * LIGHTPEN_WIDTH;
        for (i = 0; i < LIGHTPEN_WIDTH; i++) {
@@ -3165,7 +3357,7 @@ static void draw_frame2 (struct vidbuffer *vbin, struct vidbuffer *vbout)
        }
 
 #if LARGEST_LINE_DEBUG
-       //write_log (_T("%d\n"), largest);
+       write_log (_T("%d\n"), largest);
 #endif
 }
 
@@ -3277,21 +3469,29 @@ static void finish_drawing_frame (void)
 
        if (currprefs.monitoremu && gfxvidinfo.tempbuffer.bufmem_allocated) {
                setspecialmonitorpos(&gfxvidinfo.tempbuffer);
+               if (init_genlock_data != specialmonitor_need_genlock()) {
+                       init_genlock_data = specialmonitor_need_genlock();
+                       init_row_map();
+               }
                if (emulate_specialmonitors (vb, &gfxvidinfo.tempbuffer)) {
                        vb = gfxvidinfo.outbuffer = &gfxvidinfo.tempbuffer;
                        if (vb->nativepositioning)
                                setnativeposition(vb);
                        gfxvidinfo.drawbuffer.tempbufferinuse = true;
-                       if (!specialmonitoron)
-                               compute_framesync ();
+                       need_genlock_data = specialmonitor_need_genlock();
+                       if (!specialmonitoron) {
+                               compute_framesync();
+                       }
                        specialmonitoron = true;
                        do_flush_screen (vb, 0, vb->outheight);
                        didflush = true;
                } else {
-                       gfxvidinfo.drawbuffer.tempbufferinuse = false;
-                       if (specialmonitoron)
-                               compute_framesync ();
-                       specialmonitoron = false;
+                       need_genlock_data = false;
+                       if (specialmonitoron || gfxvidinfo.drawbuffer.tempbufferinuse) {
+                               gfxvidinfo.drawbuffer.tempbufferinuse = false;
+                               specialmonitoron = false;
+                               compute_framesync();
+                       }
                }
        }
 
@@ -3645,6 +3845,7 @@ void drawing_init (void)
        }
 #endif
        xlinebuffer = gfxvidinfo.drawbuffer.bufmem;
+       xlinebuffer_genlock = NULL;
 
        inhibit_frame = 0;
 

diff --git a/genlinetoscr.cpp b/genlinetoscr.cpp
index 5f3268504ab0c1e76f38c10630b89fd22d9a879e..9ba4c441f63353301daa48764dcc78528ab8d126 100644 (file)
--- a/genlinetoscr.cpp
+++ b/genlinetoscr.cpp
@@ -117,11 +117,11 @@ void outlnf (const char *s, ...)
        fputc ('\n', outfile);
 }
 
-static void out_linetoscr_decl (DEPTH_T bpp, HMODE_T hmode, int aga, int spr)
+static void out_linetoscr_decl (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, int genlock)
 {
-       outlnf ("static int NOINLINE linetoscr_%s%s%s%s (int spix, int dpix, int dpix_end)",
+       outlnf ("static int NOINLINE linetoscr_%s%s%s%s%s(int spix, int dpix, int dpix_end)",
                get_depth_str (bpp),
-               get_hmode_str (hmode), aga ? "_aga" : "", spr > 0 ? "_spr" : (spr < 0 ? "_spronly" : ""));
+               get_hmode_str (hmode), aga ? "_aga" : "", spr > 0 ? "_spr" : (spr < 0 ? "_spronly" : ""), genlock ? "_genlock" : "");
 }
 
 static void out_linetoscr_do_srcpix (DEPTH_T bpp, HMODE_T hmode, int aga, CMODE_T cmode, int spr)
@@ -222,37 +222,53 @@ static void out_linetoscr_do_incspix (DEPTH_T bpp, HMODE_T hmode, int aga, CMODE
 }
 
 
-static void put_dpix (const char *var)
+static void put_dpix (const char *var, int genlock, const char *var2)
 {
-       outlnf ("    buf[dpix++] = %s;", var);
+       if (genlock) {
+               outlnf("    genlock_buf[dpix] = %s;", var2 ? var2 : "spix_val");
+       }
+       outlnf("    buf[dpix++] = %s;", var);
 }
 
-static void out_sprite (DEPTH_T bpp, HMODE_T hmode, CMODE_T cmode, int aga, int cnt, int spr)
+static void out_sprite (DEPTH_T bpp, HMODE_T hmode, CMODE_T cmode, int aga, int cnt, int spr, int genlock)
 {
        if (aga) {
                if (cnt == 1) {
                        outlnf ( "    if (spritepixels[dpix].data) {");
                        outlnf ( "        sprcol = render_sprites (dpix + 0, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
-                       outlnf ( "        if (sprcol)");
+                       outlnf("        if (sprcol) {");
                        outlnf ( "            out_val = colors_for_drawing.acolors[sprcol];");
-                       outlnf ( "    }");
-                       put_dpix ("out_val");
+                       if (genlock)
+                               outlnf("            spix_val = sprcol;");
+                       outlnf("        }");
+                       outlnf("    }");
+                       put_dpix("out_val", genlock, NULL);
                } else if (cnt == 2) {
                        outlnf ( "    {");
                        outlnf ( "    uae_u32 out_val1 = out_val;");
                        outlnf ( "    uae_u32 out_val2 = out_val;");
-                       outlnf ( "    if (spritepixels[dpix + 0].data) {");
+                       if (genlock) {
+                               outlnf("    uae_u32 spix_val1 = spix_val;");
+                               outlnf("    uae_u32 spix_val2 = spix_val;");
+                       }
+                       outlnf("    if (spritepixels[dpix + 0].data) {");
                        outlnf ( "        sprcol = render_sprites (dpix + 0, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
-                       outlnf ( "        if (sprcol)");
+                       outlnf ( "        if (sprcol) {");
                        outlnf ( "            out_val1 = colors_for_drawing.acolors[sprcol];");
-                       outlnf ( "    }");
+                       if (genlock)
+                               outlnf("            spix_val1 = sprcol;");
+                       outlnf("        }");
+                       outlnf("    }");
                        outlnf ( "    if (spritepixels[dpix + 1].data) {");
                        outlnf ( "        sprcol = render_sprites (dpix + 1, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
-                       outlnf ( "        if (sprcol)");
+                       outlnf ( "        if (sprcol) {");
                        outlnf ( "            out_val2 = colors_for_drawing.acolors[sprcol];");
-                       outlnf ( "    }");
-                       put_dpix ("out_val1");
-                       put_dpix ("out_val2");
+                       if (genlock)
+                               outlnf("            spix_val2 = sprcol;");
+                       outlnf("        }");
+                       outlnf("    }");
+                       put_dpix("out_val1", genlock, "spix_val1");
+                       put_dpix("out_val2", genlock, "spix_val2");
                        outlnf ( "    }");
                } else if (cnt == 4) {
                        outlnf ( "    {");
@@ -260,47 +276,67 @@ static void out_sprite (DEPTH_T bpp, HMODE_T hmode, CMODE_T cmode, int aga, int
                        outlnf ( "    uae_u32 out_val2 = out_val;");
                        outlnf ( "    uae_u32 out_val3 = out_val;");
                        outlnf ( "    uae_u32 out_val4 = out_val;");
-                       outlnf ( "    if (spritepixels[dpix + 0].data) {");
+                       if (genlock) {
+                               outlnf("    uae_u32 spix_val1 = spix_val;");
+                               outlnf("    uae_u32 spix_val2 = spix_val;");
+                               outlnf("    uae_u32 spix_val3 = spix_val;");
+                               outlnf("    uae_u32 spix_val4 = spix_val;");
+                       }
+                       outlnf("    if (spritepixels[dpix + 0].data) {");
                        outlnf ( "        sprcol = render_sprites (dpix + 0, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
-                       outlnf ( "        if (sprcol)");
+                       outlnf ( "        if (sprcol) {");
                        outlnf ( "            out_val1 = colors_for_drawing.acolors[sprcol];");
-                       outlnf ( "    }");
+                       if (genlock)
+                               outlnf("            spix_val1 = sprcol;");
+                       outlnf("        }");
+                       outlnf("    }");
                        outlnf ( "    if (spritepixels[dpix + 1].data) {");
                        outlnf ( "        sprcol = render_sprites (dpix + 1, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
-                       outlnf ( "        if (sprcol)");
+                       outlnf ( "        if (sprcol) {");
                        outlnf ( "            out_val2 = colors_for_drawing.acolors[sprcol];");
-                       outlnf ( "    }");
+                       if (genlock)
+                               outlnf("            spix_val2 = sprcol;");
+                       outlnf("        }");
+                       outlnf("    }");
                        outlnf ( "    if (spritepixels[dpix + 2].data) {");
                        outlnf ( "        sprcol = render_sprites (dpix + 2, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
-                       outlnf ( "        if (sprcol)");
+                       outlnf ( "        if (sprcol) {");
                        outlnf ( "            out_val3 = colors_for_drawing.acolors[sprcol];");
-                       outlnf ( "    }");
+                       if (genlock)
+                               outlnf("            spix_val3 = sprcol;");
+                       outlnf("        }");
+                       outlnf("    }");
                        outlnf ( "    if (spritepixels[dpix + 3].data) {");
                        outlnf ( "        sprcol = render_sprites (dpix + 3, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
-                       outlnf ( "        if (sprcol)");
+                       outlnf ( "        if (sprcol) {");
                        outlnf ( "            out_val4 = colors_for_drawing.acolors[sprcol];");
-                       outlnf ( "    }");
-                       put_dpix ("out_val1");
-                       put_dpix ("out_val2");
-                       put_dpix ("out_val3");
-                       put_dpix ("out_val4");
+                       if (genlock)
+                               outlnf("            spix_val4 = sprcol;");
+                       outlnf("        }");
+                       outlnf("    }");
+                       put_dpix("out_val1", genlock, "spix_val1");
+                       put_dpix("out_val2", genlock, "spix_val2");
+                       put_dpix("out_val3", genlock, "spix_val3");
+                       put_dpix("out_val4", genlock, "spix_val4");
                        outlnf ( "    }");
                }
        } else {
                outlnf ( "    if (spritepixels[dpix].data) {");
                outlnf ( "        sprcol = render_sprites (dpix, %d, sprpix_val, %d);", cmode == CMODE_DUALPF ? 1 : 0, aga);
-               outlnf ( "        if (sprcol) {");
+               if (genlock)
+                       outlnf("        spix_val = sprcol;");
+               outlnf("        if (sprcol) {");
                outlnf ( "            uae_u32 spcol = colors_for_drawing.acolors[sprcol];");
                outlnf ( "            out_val = spcol;");
                outlnf ( "        }");
                outlnf ( "    }");
                while (cnt-- > 0)
-                       put_dpix ("out_val");
+                       put_dpix("out_val", genlock, NULL);
        }
 }
 
 
-static void out_linetoscr_mode (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, CMODE_T cmode)
+static void out_linetoscr_mode (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, CMODE_T cmode, int genlock)
 {
        int old_indent = set_indent (8);
 
@@ -310,9 +346,6 @@ static void out_linetoscr_mode (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, CM
        } else if (cmode == CMODE_DUALPF)
                outln (        "int *lookup = bpldualpfpri ? dblpf_ind2 : dblpf_ind1;");
 
-
-       /* TODO: add support for combining pixel writes in 8-bpp modes. */
-
        if (bpp == DEPTH_16BPP && hmode != HMODE_DOUBLE && hmode != HMODE_DOUBLE2X && spr == 0) {
                outln (         "int rem;");
                outln (         "if (((long)&buf[dpix]) & 2) {");
@@ -323,7 +356,7 @@ static void out_linetoscr_mode (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, CM
                out_linetoscr_do_dstpix (bpp, hmode, aga, cmode, spr);
                out_linetoscr_do_incspix (bpp, hmode, aga, cmode, spr);
 
-               put_dpix ("dpix_val");
+               put_dpix("dpix_val", genlock, NULL);
                outln (         "}");
                outln (         "if (dpix >= dpix_end)");
                outln (         "    return spix;");
@@ -332,7 +365,6 @@ static void out_linetoscr_mode (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, CM
                outln (         "    dpix_end--;");
        }
 
-
        outln (         "while (dpix < dpix_end) {");
        if (spr)
                outln (         "    uae_u32 sprpix_val;");
@@ -369,17 +401,17 @@ static void out_linetoscr_mode (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, CM
                        outln ( "    dpix += 2;");
                } else if (bpp == DEPTH_16BPP) {
                        if (spr) {
-                               out_sprite (bpp, hmode, cmode, aga, 2, spr);
+                               out_sprite(bpp, hmode, cmode, aga, 2, spr, genlock);
                        } else {
                                outln ( "    *((uae_u32 *)&buf[dpix]) = out_val;");
                                outln ( "    dpix += 2;");
                        }
                } else {
                        if (spr) {
-                               out_sprite (bpp, hmode, cmode, aga, 2, spr);
+                               out_sprite(bpp, hmode, cmode, aga, 2, spr, genlock);
                        } else {
-                               put_dpix ("out_val");
-                               put_dpix ("out_val");
+                               put_dpix("out_val", genlock, NULL);
+                               put_dpix("out_val", genlock, NULL);
                        }
                }
        } else if (hmode == HMODE_DOUBLE2X) {
@@ -388,7 +420,7 @@ static void out_linetoscr_mode (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, CM
                        outln ( "    dpix += 4;");
                } else if (bpp == DEPTH_16BPP) {
                        if (spr) {
-                               out_sprite (bpp, hmode, cmode, aga, 4, spr);
+                               out_sprite(bpp, hmode, cmode, aga, 4, spr, genlock);
                        } else {
                                outln ( "    *((uae_u32 *)&buf[dpix]) = out_val;");
                                outln ( "    dpix += 2;");
@@ -397,27 +429,27 @@ static void out_linetoscr_mode (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, CM
                        }
                } else {
                        if (spr) {
-                               out_sprite (bpp, hmode, cmode, aga, 4, spr);
+                               out_sprite(bpp, hmode, cmode, aga, 4, spr, genlock);
                        } else {
-                               put_dpix ("out_val");
-                               put_dpix ("out_val");
-                               put_dpix ("out_val");
-                               put_dpix ("out_val");
+                               put_dpix("out_val", genlock, NULL);
+                               put_dpix("out_val", genlock, NULL);
+                               put_dpix("out_val", genlock, NULL);
+                               put_dpix("out_val", genlock, NULL);
                        }
                }
        } else {
                if (bpp == DEPTH_16BPP) {
                        if (spr) {
-                               out_sprite (bpp, hmode, cmode, aga, 1, spr);
+                               out_sprite(bpp, hmode, cmode, aga, 1, spr, genlock);
                        } else {
                                outln ( "    *((uae_u32 *)&buf[dpix]) = out_val;");
                                outln ( "    dpix += 2;");
                        }
                } else {
                        if (spr) {
-                               out_sprite (bpp, hmode, cmode, aga, 1, spr);
+                               out_sprite(bpp, hmode, cmode, aga, 1, spr, genlock);
                        } else {
-                               put_dpix ("out_val");
+                               put_dpix("out_val", genlock, NULL);
                        }
                }
        }
@@ -434,7 +466,7 @@ static void out_linetoscr_mode (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, CM
                out_linetoscr_do_dstpix (bpp, hmode, aga, cmode, spr);
                out_linetoscr_do_incspix (bpp, hmode, aga, cmode, spr);
 
-               put_dpix ("dpix_val");
+               put_dpix("dpix_val", genlock, NULL);
                outln (         "}");
        }
 
@@ -443,15 +475,17 @@ static void out_linetoscr_mode (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, CM
        return;
 }
 
-static void out_linetoscr (DEPTH_T bpp, HMODE_T hmode, int aga, int spr)
+static void out_linetoscr (DEPTH_T bpp, HMODE_T hmode, int aga, int spr, int genlock)
 {
        if (aga)
                outln  ("#ifdef AGA");
 
-       out_linetoscr_decl (bpp, hmode, aga, spr);
+       out_linetoscr_decl (bpp, hmode, aga, spr, genlock);
        outln  (        "{");
 
        outlnf (        "    %s *buf = (%s *) xlinebuffer;", get_depth_type_str (bpp), get_depth_type_str (bpp));
+       if (genlock)
+               outlnf("    uae_u8 *genlock_buf = xlinebuffer_genlock;");
        if (spr)
                outln ( "    uae_u8 sprcol;");
        if (aga && spr >= 0)
@@ -460,16 +494,16 @@ static void out_linetoscr (DEPTH_T bpp, HMODE_T hmode, int aga, int spr)
 
        if (spr >= 0) {
                outln  (        "    if (bplham) {");
-               out_linetoscr_mode (bpp, hmode, aga, spr, CMODE_HAM);
+               out_linetoscr_mode(bpp, hmode, aga, spr, CMODE_HAM, genlock);
                outln  (        "    } else if (bpldualpf) {");
-               out_linetoscr_mode (bpp, hmode, aga, spr, CMODE_DUALPF);
+               out_linetoscr_mode(bpp, hmode, aga, spr, CMODE_DUALPF, genlock);
                outln  (        "    } else if (bplehb) {");
-               out_linetoscr_mode (bpp, hmode, aga, spr, CMODE_EXTRAHB);
+               out_linetoscr_mode(bpp, hmode, aga, spr, CMODE_EXTRAHB, genlock);
                outln  (        "    } else {");
-               out_linetoscr_mode (bpp, hmode, aga, spr, CMODE_NORMAL);
+               out_linetoscr_mode(bpp, hmode, aga, spr, CMODE_NORMAL, genlock);
        } else {
                outln  (        "    if (1) {");
-               out_linetoscr_mode (bpp, hmode, aga, spr, CMODE_NORMAL);
+               out_linetoscr_mode(bpp, hmode, aga, spr, CMODE_NORMAL, genlock);
        }
 
        outln  (        "    }\n");
@@ -512,8 +546,11 @@ int main (int argc, char *argv[])
                        for (spr = -1; spr <= 1; spr++) {
                                if (!aga && spr < 0)
                                        continue;
-                               for (hmode = HMODE_NORMAL; hmode <= HMODE_MAX; hmode++)
-                                       out_linetoscr (bpp, hmode, aga, spr);
+                               for (hmode = HMODE_NORMAL; hmode <= HMODE_MAX; hmode++) {
+                                       out_linetoscr(bpp, hmode, aga, spr, 0);
+                                       if (spr >= 0)
+                                               out_linetoscr(bpp, hmode, aga, spr, 1);
+                               }
                        }
                }
        }

diff --git a/include/custom.h b/include/custom.h
index 4ab060353cbab28160c5a6016a0aff34191b3eb6..960d1636aab35cfff07244e271fcba6f630b91c7 100644 (file)
--- a/include/custom.h
+++ b/include/custom.h
@@ -40,7 +40,7 @@ extern void do_copper (void);
 extern void notice_new_xcolors (void);
 extern void notice_screen_contents_lost (void);
 extern void init_row_map (void);
-extern void init_hz_full (void);
+extern void init_hz_normal (void);
 extern void init_custom (void);
 
 extern bool picasso_requested_on;

diff --git a/savestate.cpp b/savestate.cpp
index 2a414b78ee509ebd6a1aab9954074405ea51b3d5..63b98593625d56412657cf2c43c27fd95df4abfb 100644 (file)
--- a/savestate.cpp
+++ b/savestate.cpp
@@ -760,8 +760,8 @@ void savestate_restore_finish (void)
        restore_cia_finish ();
        restore_debug_memwatch_finish ();
        savestate_state = 0;
-       init_hz_full ();
-       audio_activate ();
+       init_hz_normal();
+       audio_activate();
 }
 
 /* 1=compressed,2=not compressed,3=ram dump,4=audio dump */