ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glide64] Make fast_crc private

This commit is contained in:
zilmar 2017-03-13 05:28:39 +11:00
parent 711017acf4
commit 9c25c2bd41
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Glide64/Settings.cpp
View File

@ -59,8 +59,8 @@ CSettings::CSettings() :
m_wireframe(false), m_wireframe(false),
m_wfmode(wfmode_VertexColors), m_wfmode(wfmode_VertexColors),
// Special fixes // Special fixes
fast_crc(0), m_fast_crc(false),
alt_tex_size(0), alt_tex_size(0),
use_sts1_only(0), use_sts1_only(0),
flame_corona(0), //hack for zeldas flame's corona flame_corona(0), //hack for zeldas flame's corona
@ -178,7 +178,7 @@ void CSettings::RegisterSettings(void)
game_setting(Set_force_quad3d, "force_quad3d", 0); game_setting(Set_force_quad3d, "force_quad3d", 0);
game_setting(Set_clip_zmin, "clip_zmin", 0); game_setting(Set_clip_zmin, "clip_zmin", 0);
game_setting(Set_clip_zmax, "clip_zmax", 1); game_setting(Set_clip_zmax, "clip_zmax", 1);
game_setting(Set_fast_crc, "fast_crc", 1); game_setting(Set_fast_crc, "fast_crc", true);
game_setting(Set_adjust_aspect, "adjust_aspect", 1); game_setting(Set_adjust_aspect, "adjust_aspect", 1);
game_setting(Set_zmode_compare_less, "zmode_compare_less", 0); game_setting(Set_zmode_compare_less, "zmode_compare_less", 0);
game_setting(Set_old_style_adither, "old_style_adither", 0); game_setting(Set_old_style_adither, "old_style_adither", 0);
@ -731,7 +731,7 @@ void CSettings::ReadGameSettings(const char * name)
g_settings->force_quad3d = GetSetting(Set_force_quad3d); g_settings->force_quad3d = GetSetting(Set_force_quad3d);
g_settings->clip_zmin = GetSetting(Set_clip_zmin); g_settings->clip_zmin = GetSetting(Set_clip_zmin);
g_settings->clip_zmax = GetSetting(Set_clip_zmax); g_settings->clip_zmax = GetSetting(Set_clip_zmax);
g_settings->fast_crc = GetSetting(Set_fast_crc); m_fast_crc = GetSetting(Set_fast_crc) != 0;
g_settings->adjust_aspect = GetSetting(Set_adjust_aspect); g_settings->adjust_aspect = GetSetting(Set_adjust_aspect);
g_settings->zmode_compare_less = GetSetting(Set_zmode_compare_less); g_settings->zmode_compare_less = GetSetting(Set_zmode_compare_less);
g_settings->old_style_adither = GetSetting(Set_old_style_adither); g_settings->old_style_adither = GetSetting(Set_old_style_adither);

3
Source/Glide64/Settings.h
View File

@ -235,7 +235,7 @@ public:
inline wfmode_t wfmode(void) const { return m_wfmode; } inline wfmode_t wfmode(void) const { return m_wfmode; }
// Special fixes // Special fixes
int fast_crc; inline bool fast_crc(void) const { return m_fast_crc; }
int alt_tex_size; int alt_tex_size;
int use_sts1_only; int use_sts1_only;
int flame_corona; //hack for zeldas flame's corona int flame_corona; //hack for zeldas flame's corona
@ -354,6 +354,7 @@ private:
bool m_wireframe; bool m_wireframe;
wfmode_t m_wfmode; wfmode_t m_wfmode;
ucode_t m_ucode; ucode_t m_ucode;
bool m_fast_crc;
StippleMode_t m_stipple_mode; StippleMode_t m_stipple_mode;
hacks_t m_hacks; hacks_t m_hacks;
}; };

2
Source/Glide64/TexCache.cpp
View File

@ -353,7 +353,7 @@ void GetTexInfo(int id, int tile)
if (rdp.tiles[tile].size == 3) if (rdp.tiles[tile].size == 3)
line <<= 1; line <<= 1;
uint32_t crc = 0; uint32_t crc = 0;
if (g_settings->fast_crc) if (g_settings->fast_crc())
{ {
line = (line - wid_64) << 3; line = (line - wid_64) << 3;
if (wid_64 < 1) wid_64 = 1; if (wid_64 < 1) wid_64 = 1;