diff options
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/amiga/gui.c | 31 | ||||
| -rw-r--r-- | frontends/amiga/options.h | 1 | ||||
| -rw-r--r-- | frontends/amiga/plotters.c | 3 |
3 files changed, 3 insertions, 32 deletions
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index a82482c9f..eb6be4ce6 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -4828,7 +4828,6 @@ static void ami_do_redraw(struct gui_window_2 *gwin) ULONG hcurrent,vcurrent,xoffset,yoffset,width=800,height=600; struct IBox *bbox; ULONG oldh = gwin->oldh, oldv=gwin->oldv; - struct RastPort *temprp; if(browser_window_redraw_ready(gwin->gw->bw) == false) return; @@ -4897,7 +4896,6 @@ static void ami_do_redraw(struct gui_window_2 *gwin) } else { - struct rect clip; struct redraw_context ctx = { .interactive = true, .background_images = true, @@ -4905,33 +4903,8 @@ static void ami_do_redraw(struct gui_window_2 *gwin) .priv = browserglob }; - if(nsoption_bool(direct_render) == false) - { - ami_do_redraw_tiled(gwin, true, hcurrent, vcurrent, width, height, hcurrent, vcurrent, bbox, &ctx); - } - else - { -#if 0 -/**FIXME: this is broken, only exists for debugging */ - ami_plot_ra_set_pen_list(browserglob, gwin->shared_pens); - temprp = browserglob->rp; - browserglob->rp = gwin->win->RPort; - clip.x0 = bbox->Left; - clip.y0 = bbox->Top; - clip.x1 = bbox->Left + bbox->Width; - clip.y1 = bbox->Top + bbox->Height; - - ami_set_pointer(gwin, GUI_POINTER_WAIT, false); - - if(browser_window_redraw(gwin->gw->bw, clip.x0 - hcurrent, clip.y0 - vcurrent, &clip, &ctx)) - { - ami_clearclipreg(browserglob); - browserglob->rp = temprp; - } - - ami_reset_pointer(gwin); -#endif - } + ami_do_redraw_tiled(gwin, true, hcurrent, vcurrent, width, height, hcurrent, vcurrent, bbox, &ctx); + /* Tell NetSurf not to bother with the next queued box redraw, as we've redrawn everything. */ ami_gui_window_update_box_deferred(gwin->gw, false); } diff --git a/frontends/amiga/options.h b/frontends/amiga/options.h index b5b2b3b07..a2cc92e11 100644 --- a/frontends/amiga/options.h +++ b/frontends/amiga/options.h @@ -79,7 +79,6 @@ NSOPTION_INTEGER(cookies_window_ypos, 0) NSOPTION_INTEGER(cookies_window_xsize, 0) NSOPTION_INTEGER(cookies_window_ysize, 0) NSOPTION_INTEGER(web_search_width, 0) -NSOPTION_BOOL(direct_render, false) NSOPTION_BOOL(window_simple_refresh, false) NSOPTION_BOOL(resize_with_contents, false) NSOPTION_INTEGER(reformat_delay, 0) diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c index cc48fc442..0b41dea92 100644 --- a/frontends/amiga/plotters.c +++ b/frontends/amiga/plotters.c @@ -460,8 +460,7 @@ ami_bitmap(struct gui_globals *glob, int x, int y, int width, int height, struct #ifdef __amigaos4__ if (__builtin_expect((GfxBase->LibNode.lib_Version >= 53) && - (glob->palette_mapped == false) && - (nsoption_bool(direct_render) == false), 1)) { + (glob->palette_mapped == false), 1)) { uint32 comptype = COMPOSITE_Src_Over_Dest; uint32 compflags = COMPFLAG_IgnoreDestAlpha; if(amiga_bitmap_get_opaque(bitmap)) { |