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

Minor cleanup

Browse source
This commit is contained in:
Dimitris Panokostas 2019-09-17 22:28:57 +02:00
parent e0878f9c4c
commit 6e1994fee5
5 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/custom.cpp
View file

@ -566,10 +566,10 @@ static int expand_sprres(uae_u16 con0, uae_u16 con3)
STATIC_INLINE uae_u8 *pfield_xlateptr (uaecptr plpt, int bytecount)
{
plpt &= chipmem_bank.mask;
if((plpt + bytecount) > chipmem_bank.reserved_size)
return NULL;
return chipmem_bank.baseaddr + plpt;
plpt &= chipmem_bank.mask;
if((plpt + bytecount) > chipmem_bank.reserved_size)
return NULL;
return chipmem_bank.baseaddr + plpt;
}
static void docols (struct color_entry *colentry)
{
@ -974,7 +974,6 @@ static void set_chipset_mode(void)
static void update_mirrors(void)
{
aga_mode = (currprefs.chipset_mask & CSMASK_AGA) != 0;
direct_rgb = aga_mode;
if (currprefs.chipset_mask & CSMASK_AGA)
sprite_sprctlmask = 0x01 | 0x08 | 0x10;
else if (currprefs.chipset_mask & CSMASK_ECS_DENISE)
@ -8233,6 +8232,7 @@ void custom_reset (bool hardreset, bool keyboardreset)
vsync_counter = 0;
currprefs.chipset_mask = changed_prefs.chipset_mask;
update_mirrors ();
blitter_reset ();
if (hardreset) {
if (!aga_mode) {
@ -8311,7 +8311,6 @@ void custom_reset (bool hardreset, bool keyboardreset)
diwstate = DIW_waiting_start;
dmal = 0;
// new_beamcon0 = currprefs.ntscmode ? 0x00 : 0x20;
#ifdef USE_DISPMANX
time_per_frame = 1000 * 1000 / (currprefs.ntscmode ? 60 : 50);
#endif
@ -9512,8 +9511,9 @@ void check_prefs_changed_custom (void)
currprefs.immediate_blits = changed_prefs.immediate_blits;
currprefs.waiting_blits = changed_prefs.waiting_blits;
currprefs.collision_level = changed_prefs.collision_level;
#ifdef AMIBERRY
currprefs.fast_copper = changed_prefs.fast_copper;
#endif
currprefs.cs_ciaatod = changed_prefs.cs_ciaatod;
currprefs.cs_rtc = changed_prefs.cs_rtc;
currprefs.cs_cd32cd = changed_prefs.cs_cd32cd;

1
src/drawing.cpp
View file

@ -102,7 +102,6 @@ static void lores_reset (void)
}
bool aga_mode; /* mirror of chipset_mask & CSMASK_AGA */
bool direct_rgb;
/* The shift factor to apply when converting between Amiga coordinates and window
coordinates. Zero if the resolution is the same, positive if window coordinates

2
src/include/custom.h
View file

@ -41,8 +41,6 @@ extern void init_row_map (void);
extern void init_hz_normal (void);
extern void init_custom (void);
extern bool picasso_requested_on, picasso_requested_forced_on, picasso_on;
extern unsigned long int hsync_counter;
extern uae_u16 dmacon;

2
src/include/drawing.h
View file

@ -51,7 +51,7 @@ before it appears on-screen. (TW: display emulation now does this automatically)
#define max_diwlastword (PIXEL_XPOS(0x1d4 >> 1))
extern int lores_shift, shres_shift, interlace_seen;
extern bool aga_mode, direct_rgb;
extern bool aga_mode;
extern int visible_left_border, visible_right_border;
extern int detected_screen_resolution;

2
src/include/xwin.h
View file

@ -75,7 +75,7 @@ extern void alloc_colors64k (int, int, int, int, int, int, int, int, int, int, b
extern void alloc_colors_rgb (int rw, int gw, int bw, int rs, int gs, int bs, int aw, int as, int alpha, int byte_swap,
uae_u32 *rc, uae_u32 *gc, uae_u32 *bc);
extern void alloc_colors_picasso (int rw, int gw, int bw, int rs, int gs, int bs, int rgbfmt, uae_u32 *rgbx16);
//extern float getvsyncrate(float hz, int *mult);
extern float getvsyncrate(float hz, int *mult);
/* The graphics code has a choice whether it wants to use a large buffer
* for the whole display, or only a small buffer for a single line.