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

[Glide64] Make autodetect_ucode private

This commit is contained in:
zilmar 2017-03-13 05:00:37 +11:00
parent 26841063ae
commit d915f57573
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Glide64/Settings.cpp
View File

@ -53,7 +53,7 @@ CSettings::CSettings() :
m_ghq_cache_size(0), m_ghq_cache_size(0),
m_ghq_hirs_let_texartists_fly(false), m_ghq_hirs_let_texartists_fly(false),
m_ghq_hirs_dump(false), m_ghq_hirs_dump(false),
autodetect_ucode(0), m_autodetect_ucode(true),
m_ucode(ucode_Fast3D), m_ucode(ucode_Fast3D),
unk_as_red(0), unk_as_red(0),
unk_clear(0), unk_clear(0),
@ -129,7 +129,7 @@ void CSettings::RegisterSettings(void)
#endif #endif
general_setting(Set_Rotate, "rotate", Rotate_None); general_setting(Set_Rotate, "rotate", Rotate_None);
general_setting(Set_wrpAnisotropic, "wrpAnisotropic", 0); general_setting(Set_wrpAnisotropic, "wrpAnisotropic", 0);
general_setting(Set_autodetect_ucode, "autodetect_ucode", 1); general_setting(Set_autodetect_ucode, "autodetect_ucode", true);
general_setting(Set_ucode, "ucode", ucode_F3DEX2); general_setting(Set_ucode, "ucode", ucode_F3DEX2);
general_setting(Set_wireframe, "wireframe", 0); general_setting(Set_wireframe, "wireframe", 0);
general_setting(Set_wfmode, "wfmode", 1); general_setting(Set_wfmode, "wfmode", 1);
@ -552,14 +552,13 @@ void CSettings::ReadSettings()
this->wrpFBO = GetSetting(Set_wrpFBO); this->wrpFBO = GetSetting(Set_wrpFBO);
this->wrpAnisotropic = GetSetting(Set_wrpAnisotropic); this->wrpAnisotropic = GetSetting(Set_wrpAnisotropic);
m_autodetect_ucode = GetSetting(Set_autodetect_ucode) != 0;
#ifndef _ENDUSER_RELEASE_ #ifndef _ENDUSER_RELEASE_
this->autodetect_ucode = GetSetting(Set_autodetect_ucode);
this->wireframe = GetSetting(Set_wireframe); this->wireframe = GetSetting(Set_wireframe);
this->wfmode = GetSetting(Set_wfmode); this->wfmode = GetSetting(Set_wfmode);
this->unk_as_red = GetSetting(Set_unk_as_red); this->unk_as_red = GetSetting(Set_unk_as_red);
this->unk_clear = GetSetting(Set_unk_clear); this->unk_clear = GetSetting(Set_unk_clear);
#else #else
this->autodetect_ucode = TRUE;
this->wireframe = FALSE; this->wireframe = FALSE;
this->wfmode = 0; this->wfmode = 0;
this->unk_as_red = FALSE; this->unk_as_red = FALSE;
@ -830,9 +829,9 @@ void CSettings::WriteSettings(void)
SetSetting(Set_wrpVRAM, g_settings->wrpVRAM); SetSetting(Set_wrpVRAM, g_settings->wrpVRAM);
SetSetting(Set_wrpFBO, g_settings->wrpFBO); SetSetting(Set_wrpFBO, g_settings->wrpFBO);
SetSetting(Set_wrpAnisotropic, g_settings->wrpAnisotropic); SetSetting(Set_wrpAnisotropic, g_settings->wrpAnisotropic);
SetSetting(Set_autodetect_ucode, m_autodetect_ucode);
#ifndef _ENDUSER_RELEASE_ #ifndef _ENDUSER_RELEASE_
SetSetting(Set_autodetect_ucode, g_settings->autodetect_ucode);
SetSetting(Set_ucode, (int)g_settings->ucode); SetSetting(Set_ucode, (int)g_settings->ucode);
SetSetting(Set_wireframe, g_settings->wireframe); SetSetting(Set_wireframe, g_settings->wireframe);
SetSetting(Set_wfmode, g_settings->wfmode); SetSetting(Set_wfmode, g_settings->wfmode);

3
Source/Glide64/Settings.h
View File

@ -222,7 +222,7 @@ public:
inline bool ghq_hirs_dump(void) const { return m_ghq_hirs_dump; } inline bool ghq_hirs_dump(void) const { return m_ghq_hirs_dump; }
//Debug //Debug
int autodetect_ucode; inline bool autodetect_ucode(void) const { return m_autodetect_ucode; }
inline ucode_t ucode(void) const { return m_ucode; } inline ucode_t ucode(void) const { return m_ucode; }
int unk_as_red; int unk_as_red;
int unk_clear; int unk_clear;
@ -346,6 +346,7 @@ private:
int m_ghq_cache_size; int m_ghq_cache_size;
bool m_ghq_hirs_let_texartists_fly; bool m_ghq_hirs_let_texartists_fly;
bool m_ghq_hirs_dump; bool m_ghq_hirs_dump;
bool m_autodetect_ucode;
ucode_t m_ucode; ucode_t m_ucode;
StippleMode_t m_stipple_mode; StippleMode_t m_stipple_mode;
hacks_t m_hacks; hacks_t m_hacks;

2
Source/Glide64/rdp.cpp
View File

@ -576,7 +576,7 @@ EXPORT void CALL ProcessDList(void)
if (reset) if (reset)
{ {
reset = 0; reset = 0;
if (g_settings->autodetect_ucode) if (g_settings->autodetect_ucode())
{ {
// Thanks to ZeZu for ucode autodetection!!! // Thanks to ZeZu for ucode autodetection!!!
uint32_t startUcode = *(uint32_t*)(gfx.DMEM + 0xFD0); uint32_t startUcode = *(uint32_t*)(gfx.DMEM + 0xFD0);