pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enabled commented out lores_mode code

Browse source
This commit is contained in:
Dimitris Panokostas 2018-10-31 21:19:09 +01:00
parent 7790e08cf1
commit 0929f7f1a7
3 changed files with 82 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/cfgfile.cpp
View file

@ -75,6 +75,9 @@ static const TCHAR* soundfiltermode1[] = {_T("off"), _T("emulated"), _T("on"), n
static const TCHAR* soundfiltermode2[] = {_T("standard"), _T("enhanced"), nullptr};
static const TCHAR* lorestype1[] = {_T("lores"), _T("hires"), _T("superhires"), nullptr};
static const TCHAR* lorestype2[] = {_T("true"), _T("false"), nullptr};
static const TCHAR *loresmode[] = { _T("normal"), _T("filtered"), 0 };
static const TCHAR *horizmode[] = { _T("vertical"), _T("lores"), _T("hires"), _T("superhires"), 0 };
static const TCHAR *vertmode[] = { _T("horizontal"), _T("single"), _T("double"), _T("quadruple"), 0 };
static const TCHAR* cartsmode[] = {_T("none"), _T("hrtmon"), nullptr};
static const TCHAR* idemode[] = {_T("none"), _T("a600/a1200"), _T("a4000"), nullptr};
static const TCHAR* rtctype[] = {_T("none"), _T("MSM6242B"), _T("RP5C01A"), _T("MSM6242B_A2000"), nullptr};
@ -1409,6 +1412,7 @@ void cfgfile_save_options(struct zfile* f, struct uae_prefs* p, int type)
cfgfile_write_bool(f, _T("gfx_lores"), p->gfx_resolution == 0);
cfgfile_write_str(f, _T("gfx_resolution"), lorestype1[p->gfx_resolution]);
cfgfile_write_str(f, _T("gfx_lores_mode"), loresmode[p->gfx_lores_mode]);
cfgfile_write_str(f, _T("gfx_linemode"), p->gfx_vresolution > 0 ? linemode[p->gfx_iscanlines * 4 + p->gfx_pscanlines + 1] : linemode[0]);
cfgfile_write_str(f, _T("gfx_fullscreen_amiga"), fullmodes[p->gfx_apmode[0].gfx_fullscreen]);
cfgfile_write_str(f, _T("gfx_fullscreen_picasso"), fullmodes[p->gfx_apmode[1].gfx_fullscreen]);
@ -2300,6 +2304,7 @@ static int cfgfile_parse_host(struct uae_prefs* p, TCHAR* option, TCHAR* value)
|| cfgfile_strboolval(option, value, _T("use_gui"), &p->start_gui, guimode3, 0)
|| cfgfile_strval(option, value, _T("gfx_resolution"), &p->gfx_resolution, lorestype1, 0)
|| cfgfile_strval(option, value, _T("gfx_lores"), &p->gfx_resolution, lorestype2, 0)
|| cfgfile_strval(option, value, _T("gfx_lores_mode"), &p->gfx_lores_mode, loresmode, 0)
|| cfgfile_strval(option, value, _T("gfx_fullscreen_amiga"), &p->gfx_apmode[APMODE_NATIVE].gfx_fullscreen, fullmodes, 0)
|| cfgfile_strval(option, value, _T("gfx_fullscreen_picasso"), &p->gfx_apmode[APMODE_RTG].gfx_fullscreen, fullmodes, 0)
|| cfgfile_strval(option, value, _T("absolute_mouse"), &p->input_tablet, abspointers, 0))

148
src/drawing.cpp
View file

@ -1471,21 +1471,21 @@ static void pfield_set_linetoscr(void)
}
}
else if (res_shift == -1) {
//if (currprefs.gfx_lores_mode) {
// switch (gfxvidinfo.drawbuffer.pixbytes) {
// case 2:
// pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_16_shrink1f_aga_genlock : linetoscr_16_shrink1f_aga;
// pfield_do_linetoscr_sprite = need_genlock_data ? linetoscr_16_shrink1f_aga_spr_genlock : linetoscr_16_shrink1f_aga_spr;
// pfield_do_linetoscr_spriteonly = linetoscr_16_shrink1f_aga_spronly;
// break;
// case 4:
// pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_32_shrink1f_aga_genlock : linetoscr_32_shrink1f_aga;
// pfield_do_linetoscr_sprite = need_genlock_data ? linetoscr_32_shrink1f_aga_spr_genlock : linetoscr_32_shrink1f_aga_spr;
// pfield_do_linetoscr_spriteonly = linetoscr_32_shrink1f_aga_spronly;
// break;
// }
//}
//else {
if (currprefs.gfx_lores_mode) {
switch (gfxvidinfo.drawbuffer.pixbytes) {
case 2:
pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_16_shrink1f_aga_genlock : linetoscr_16_shrink1f_aga;
pfield_do_linetoscr_sprite = need_genlock_data ? linetoscr_16_shrink1f_aga_spr_genlock : linetoscr_16_shrink1f_aga_spr;
pfield_do_linetoscr_spriteonly = linetoscr_16_shrink1f_aga_spronly;
break;
case 4:
pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_32_shrink1f_aga_genlock : linetoscr_32_shrink1f_aga;
pfield_do_linetoscr_sprite = need_genlock_data ? linetoscr_32_shrink1f_aga_spr_genlock : linetoscr_32_shrink1f_aga_spr;
pfield_do_linetoscr_spriteonly = linetoscr_32_shrink1f_aga_spronly;
break;
}
}
else {
switch (gfxvidinfo.drawbuffer.pixbytes) {
case 2:
pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_16_shrink1_aga_genlock : linetoscr_16_shrink1_aga;
@ -1498,24 +1498,24 @@ static void pfield_set_linetoscr(void)
pfield_do_linetoscr_spriteonly = linetoscr_32_shrink1_aga_spronly;
break;
}
//}
}
}
else if (res_shift == -2) {
//if (currprefs.gfx_lores_mode) {
// switch (gfxvidinfo.drawbuffer.pixbytes) {
// case 2:
// pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_16_shrink2f_aga_genlock : linetoscr_16_shrink2f_aga;
// pfield_do_linetoscr_sprite = need_genlock_data ? linetoscr_16_shrink2f_aga_spr_genlock : linetoscr_16_shrink2f_aga_spr;
// pfield_do_linetoscr_spriteonly = linetoscr_16_shrink2f_aga_spronly;
// break;
// case 4:
// pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_32_shrink2f_aga_genlock : linetoscr_32_shrink2f_aga;
// pfield_do_linetoscr_sprite = need_genlock_data ? linetoscr_32_shrink2f_aga_spr_genlock : linetoscr_32_shrink2f_aga_spr;
// pfield_do_linetoscr_spriteonly = linetoscr_32_shrink2f_aga_spronly;
// break;
// }
//}
//else {
if (currprefs.gfx_lores_mode) {
switch (gfxvidinfo.drawbuffer.pixbytes) {
case 2:
pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_16_shrink2f_aga_genlock : linetoscr_16_shrink2f_aga;
pfield_do_linetoscr_sprite = need_genlock_data ? linetoscr_16_shrink2f_aga_spr_genlock : linetoscr_16_shrink2f_aga_spr;
pfield_do_linetoscr_spriteonly = linetoscr_16_shrink2f_aga_spronly;
break;
case 4:
pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_32_shrink2f_aga_genlock : linetoscr_32_shrink2f_aga;
pfield_do_linetoscr_sprite = need_genlock_data ? linetoscr_32_shrink2f_aga_spr_genlock : linetoscr_32_shrink2f_aga_spr;
pfield_do_linetoscr_spriteonly = linetoscr_32_shrink2f_aga_spronly;
break;
}
}
else {
switch (gfxvidinfo.drawbuffer.pixbytes) {
case 2:
pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_16_shrink2_aga_genlock : linetoscr_16_shrink2_aga;
@ -1528,7 +1528,7 @@ static void pfield_set_linetoscr(void)
pfield_do_linetoscr_spriteonly = linetoscr_32_shrink2_aga_spronly;
break;
}
//}
}
}
if (get_shdelay_add()) {
pfield_do_linetoscr_shdelay_normal = pfield_do_linetoscr_normal;
@ -1554,19 +1554,19 @@ static void pfield_set_linetoscr(void)
}
}
else if (res_shift == -1) {
//if (currprefs.gfx_lores_mode) {
// switch (gfxvidinfo.drawbuffer.pixbytes) {
// case 2:
// pfield_do_linetoscr_normal = linetoscr_16_shrink1f_sh;
// pfield_do_linetoscr_sprite = linetoscr_16_shrink1f_sh_spr;
// break;
// case 4:
// pfield_do_linetoscr_normal = linetoscr_32_shrink1f_sh;
// pfield_do_linetoscr_sprite = linetoscr_32_shrink1f_sh_spr;
// break;
// }
//}
//else {
if (currprefs.gfx_lores_mode) {
switch (gfxvidinfo.drawbuffer.pixbytes) {
case 2:
pfield_do_linetoscr_normal = linetoscr_16_shrink1f_sh;
pfield_do_linetoscr_sprite = linetoscr_16_shrink1f_sh_spr;
break;
case 4:
pfield_do_linetoscr_normal = linetoscr_32_shrink1f_sh;
pfield_do_linetoscr_sprite = linetoscr_32_shrink1f_sh_spr;
break;
}
}
else {
switch (gfxvidinfo.drawbuffer.pixbytes) {
case 2:
pfield_do_linetoscr_normal = linetoscr_16_shrink1_sh;
@ -1577,22 +1577,22 @@ static void pfield_set_linetoscr(void)
pfield_do_linetoscr_sprite = linetoscr_32_shrink1_sh_spr;
break;
}
//}
}
}
else if (res_shift == -2) {
//if (currprefs.gfx_lores_mode) {
// switch (gfxvidinfo.drawbuffer.pixbytes) {
// case 2:
// pfield_do_linetoscr_normal = linetoscr_16_shrink2f_sh;
// pfield_do_linetoscr_sprite = linetoscr_16_shrink2f_sh_spr;
// break;
// case 4:
// pfield_do_linetoscr_normal = linetoscr_32_shrink2f_sh;
// pfield_do_linetoscr_sprite = linetoscr_32_shrink2f_sh_spr;
// break;
// }
//}
//else {
if (currprefs.gfx_lores_mode) {
switch (gfxvidinfo.drawbuffer.pixbytes) {
case 2:
pfield_do_linetoscr_normal = linetoscr_16_shrink2f_sh;
pfield_do_linetoscr_sprite = linetoscr_16_shrink2f_sh_spr;
break;
case 4:
pfield_do_linetoscr_normal = linetoscr_32_shrink2f_sh;
pfield_do_linetoscr_sprite = linetoscr_32_shrink2f_sh_spr;
break;
}
}
else {
switch (gfxvidinfo.drawbuffer.pixbytes) {
case 2:
pfield_do_linetoscr_normal = linetoscr_16_shrink2_sh;
@ -1603,7 +1603,7 @@ static void pfield_set_linetoscr(void)
pfield_do_linetoscr_sprite = linetoscr_32_shrink2_sh_spr;
break;
}
//}
}
}
}
#endif
@ -1645,19 +1645,19 @@ static void pfield_set_linetoscr(void)
}
}
else if (res_shift == -1) {
//if (currprefs.gfx_lores_mode) {
// switch (gfxvidinfo.drawbuffer.pixbytes) {
// case 2:
// pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_16_shrink1f_genlock : linetoscr_16_shrink1f;
// pfield_do_linetoscr_sprite = need_genlock_data ? linetoscr_16_shrink1f_spr_genlock : linetoscr_16_shrink1f_spr;
// break;
// case 4:
// pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_32_shrink1f_genlock : linetoscr_32_shrink1f;
// pfield_do_linetoscr_sprite = need_genlock_data ? linetoscr_32_shrink1f_spr_genlock : linetoscr_32_shrink1f_spr;
// break;
// }
//}
//else {
if (currprefs.gfx_lores_mode) {
switch (gfxvidinfo.drawbuffer.pixbytes) {
case 2:
pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_16_shrink1f_genlock : linetoscr_16_shrink1f;
pfield_do_linetoscr_sprite = need_genlock_data ? linetoscr_16_shrink1f_spr_genlock : linetoscr_16_shrink1f_spr;
break;
case 4:
pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_32_shrink1f_genlock : linetoscr_32_shrink1f;
pfield_do_linetoscr_sprite = need_genlock_data ? linetoscr_32_shrink1f_spr_genlock : linetoscr_32_shrink1f_spr;
break;
}
}
else {
switch (gfxvidinfo.drawbuffer.pixbytes) {
case 2:
pfield_do_linetoscr_normal = need_genlock_data ? linetoscr_16_shrink1_genlock : linetoscr_16_shrink1;
@ -1668,7 +1668,7 @@ static void pfield_set_linetoscr(void)
pfield_do_linetoscr_sprite = need_genlock_data ? linetoscr_32_shrink1_spr_genlock : linetoscr_32_shrink1_spr;
break;
}
//}
}
}
}
}

4
src/osdep/amiberry_gfx.cpp
View file

@ -689,7 +689,8 @@ int check_prefs_changed_gfx()
currprefs.gfx_size.width != changed_prefs.gfx_size.width ||
currprefs.gfx_resolution != changed_prefs.gfx_resolution ||
currprefs.gfx_vresolution != changed_prefs.gfx_vresolution ||
currprefs.gfx_correct_aspect != changed_prefs.gfx_correct_aspect)
currprefs.gfx_correct_aspect != changed_prefs.gfx_correct_aspect ||
currprefs.gfx_lores_mode != changed_prefs.gfx_lores_mode)
{
cfgfile_configuration_change(1);
currprefs.gfx_size.height = changed_prefs.gfx_size.height;
@ -697,6 +698,7 @@ int check_prefs_changed_gfx()
currprefs.gfx_resolution = changed_prefs.gfx_resolution;
currprefs.gfx_vresolution = changed_prefs.gfx_vresolution;
currprefs.gfx_correct_aspect = changed_prefs.gfx_correct_aspect;
currprefs.gfx_lores_mode = changed_prefs.gfx_lores_mode;
update_display(&currprefs);
changed = 1;
}