LIV2/WinUAE
1
0
Fork 0
mirror of https://github.com/LIV2/WinUAE.git synced 2025-12-06 00:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed obsolete software statusline support.

Browse Source
This commit is contained in:
Toni Wilen 2022-07-23 21:34:32 +03:00
parent f65526dab1
commit d39e28a282
7 changed files with 1 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drawing.cpp
View File

@ -4207,7 +4207,6 @@ static void init_drawing_frame (void)
}
static int lightpen_y1[2], lightpen_y2[2];
static int statusbar_y1, statusbar_y2;
void putpixel(uae_u8 *buf, uae_u8 *genlockbuf, int bpp, int x, xcolnr c8)
{
@ -4489,21 +4488,6 @@ static void draw_frame2(struct vidbuffer *vbin, struct vidbuffer *vbout)
static void draw_frame_extras(struct vidbuffer *vb, int y_start, int y_end)
{
if ((currprefs.leds_on_screen & STATUSLINE_CHIPSET) && softstatusline()) {
int slx, sly;
int mult = statusline_get_multiplier(vb->monitor_id) / 100;
statusline_getpos(vb->monitor_id, &slx, &sly, vb->outwidth, vb->outheight);
statusbar_y1 = sly + min_ypos_for_screen - 1;
statusbar_y2 = statusbar_y1 + TD_TOTAL_HEIGHT * mult + 1;
draw_status_line(vb->monitor_id, sly, -1);
for (int i = 0; i < TD_TOTAL_HEIGHT * mult; i++) {
int line = sly + i;
draw_status_line(vb->monitor_id, line, i);
}
} else {
statusbar_y1 = 0;
statusbar_y1 = 0;
}
if (debug_dma > 1 || debug_heatmap > 1) {
for (int i = 0; i < vb->outheight; i++) {
int line = i;
@ -4977,8 +4961,7 @@ void hsync_record_line_state (int lineno, enum nln_how how, int changed)
state = linestate + lineno;
changed |= ad->frame_redraw_necessary != 0 || refresh_indicator_buffer != NULL ||
((lineno >= lightpen_y1[0] && lineno < lightpen_y2[0]) ||
(lineno >= lightpen_y1[1] && lineno < lightpen_y2[1]) ||
(lineno >= statusbar_y1 && lineno < statusbar_y2));
(lineno >= lightpen_y1[1] && lineno < lightpen_y2[1]));
switch (how) {
case nln_normal:

6
framebufferboards.cpp
View File

@ -67,15 +67,9 @@ static struct fb_struct *fb_last;
static bool fb_get_surface(struct fb_struct *data)
{
struct amigadisplay *ad = &adisplays[data->monitor_id];
bool gotsurf = false;
if (ad->picasso_on) {
if (data->surface == NULL) {
data->surface = gfx_lock_picasso(data->monitor_id, false);
gotsurf = true;
}
if (data->surface && gotsurf) {
if (softstatusline())
picasso_statusline(data->monitor_id, data->surface);
}
}
return data->surface != NULL;

11
gfxboard.cpp
View File

@ -1625,17 +1625,6 @@ void gfxboard_vsync_handler(bool full_redraw_required, bool redraw_required)
}
if (ad->picasso_on && !gb->resolutionchange) {
if (!gb->monitor_id) {
if (currprefs.leds_on_screen & STATUSLINE_RTG) {
if (gb->gfxboard_surface == NULL) {
gb->gfxboard_surface = gfx_lock_picasso(gb->monitor_id, false);
}
if (gb->gfxboard_surface) {
if (softstatusline())
picasso_statusline(gb->monitor_id, gb->gfxboard_surface);
}
}
}
if (gb->fullrefresh > 0)
gb->fullrefresh--;
}

1
include/statusline.h
View File

@ -35,7 +35,6 @@ extern int td_width;
void draw_status_line_single(int monid, uae_u8 *buf, int bpp, int y, int totalwidth, uae_u32 *rc, uae_u32 *gc, uae_u32 *bc, uae_u32 *alpha);
void statusline_single_erase(int monid, uae_u8 *buf, int bpp, int y, int totalwidth);
void statusline_getpos(int monid, int *x, int *y, int width, int height);
bool softstatusline(void);
#define STATUSTYPE_FLOPPY 1
#define STATUSTYPE_DISPLAY 2

6
mame/a2410.cpp
View File

@ -673,15 +673,9 @@ static void get_a2410_surface(struct a2410_struct *data)
int monid = currprefs.rtgboards[data->a2410_gfxboard].monitor_id;
struct amigadisplay *ad = &adisplays[monid];
bool gotsurf = false;
if (ad->picasso_on) {
if (data->a2410_surface == NULL) {
data->a2410_surface = gfx_lock_picasso(monid, false);
gotsurf = true;
}
if (data->a2410_surface && gotsurf) {
if (softstatusline())
picasso_statusline(monid, data->a2410_surface);
}
}
}

3
od-win32/picasso96_win.cpp
View File

@ -5682,9 +5682,6 @@ static void picasso_flushpixels(int index, uae_u8 *src, int off, bool render)
dstp = gfx_lock_picasso(monid, false);
}
if (dstp) {
if (softstatusline()) {
picasso_statusline(monid, dstp);
}
maxy = vidinfo->height;
if (miny > vidinfo->height - TD_TOTAL_HEIGHT)
miny = vidinfo->height - TD_TOTAL_HEIGHT;

5
od-win32/statusline_win32.cpp
View File

@ -24,11 +24,6 @@ static HPALETTE statusline_palette;
static bool statusline_was_updated;
static char *td_new_numbers;
bool softstatusline(void)
{
return false;
}
void deletestatusline(int monid)
{
if (monid)