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

[Glide64] Make ghq_enht_cmpr private

This commit is contained in:
zilmar 2017-03-10 16:31:59 +11:00
parent 273980e510
commit efd98d4d23
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Glide64/Config.cpp
View File

@ -640,7 +640,7 @@ public:
TTSetTxt(IDC_CHK_HIRES_TEX_COMPRESSION, tooltip.c_str()); TTSetTxt(IDC_CHK_HIRES_TEX_COMPRESSION, tooltip.c_str());
m_cbxEnhTexCompression.Attach(GetDlgItem(IDC_CHK_TEX_COMPRESSION)); m_cbxEnhTexCompression.Attach(GetDlgItem(IDC_CHK_TEX_COMPRESSION));
m_cbxEnhTexCompression.SetCheck(g_settings->ghq_enht_cmpr > 0 ? BST_CHECKED : BST_UNCHECKED); m_cbxEnhTexCompression.SetCheck(g_settings->ghq_enht_cmpr() > 0 ? BST_CHECKED : BST_UNCHECKED);
m_cbxHrsTexCompression.Attach(GetDlgItem(IDC_CHK_HIRES_TEX_COMPRESSION)); m_cbxHrsTexCompression.Attach(GetDlgItem(IDC_CHK_HIRES_TEX_COMPRESSION));
m_cbxHrsTexCompression.SetCheck(g_settings->ghq_hirs_cmpr > 0 ? BST_CHECKED : BST_UNCHECKED); m_cbxHrsTexCompression.SetCheck(g_settings->ghq_hirs_cmpr > 0 ? BST_CHECKED : BST_UNCHECKED);
@ -692,7 +692,7 @@ public:
g_settings->SetGhqEnht((CSettings::TextureEnhancement_t)m_cmbEnhEnhancement.GetItemData(m_cmbEnhEnhancement.GetCurSel())); g_settings->SetGhqEnht((CSettings::TextureEnhancement_t)m_cmbEnhEnhancement.GetItemData(m_cmbEnhEnhancement.GetCurSel()));
g_settings->ghq_cache_size = atoi(texcache); g_settings->ghq_cache_size = atoi(texcache);
g_settings->ghq_enht_nobg = (int)m_cbxEnhIgnoreBG.GetCheck() == BST_CHECKED; g_settings->ghq_enht_nobg = (int)m_cbxEnhIgnoreBG.GetCheck() == BST_CHECKED;
g_settings->ghq_enht_cmpr = (int)m_cbxEnhTexCompression.GetCheck() == BST_CHECKED; g_settings->SetGhqEnhtCmpr(m_cbxEnhTexCompression.GetCheck() == BST_CHECKED);
g_settings->ghq_enht_gz = (int)m_cbxEnhCompressCache.GetCheck() == BST_CHECKED; g_settings->ghq_enht_gz = (int)m_cbxEnhCompressCache.GetCheck() == BST_CHECKED;
g_settings->SetGhqHirs((CSettings::HiResPackFormat_t)m_cmbHrsFormat.GetItemData(m_cmbHrsFormat.GetCurSel())); g_settings->SetGhqHirs((CSettings::HiResPackFormat_t)m_cmbHrsFormat.GetItemData(m_cmbHrsFormat.GetCurSel()));
g_settings->ghq_hirs_tile = (int)m_cbxHrsTile.GetCheck() == BST_CHECKED; g_settings->ghq_hirs_tile = (int)m_cbxHrsTile.GetCheck() == BST_CHECKED;

2
Source/Glide64/Main.cpp
View File

@ -661,7 +661,7 @@ int InitGfx()
{ {
/* Plugin path */ /* Plugin path */
int options = g_settings->ghq_fltr() | g_settings->ghq_enht() | g_settings->ghq_cmpr() | g_settings->ghq_hirs(); int options = g_settings->ghq_fltr() | g_settings->ghq_enht() | g_settings->ghq_cmpr() | g_settings->ghq_hirs();
if (g_settings->ghq_enht_cmpr) if (g_settings->ghq_enht_cmpr())
{ {
options |= COMPRESS_TEX; options |= COMPRESS_TEX;
} }

17
Source/Glide64/Settings.cpp
View File

@ -40,7 +40,7 @@ CSettings::CSettings() :
m_ghq_enht(TextureEnht_None), m_ghq_enht(TextureEnht_None),
m_ghq_cmpr(TextureCompression_S3TC), m_ghq_cmpr(TextureCompression_S3TC),
m_ghq_hirs(HiResPackFormat_None), m_ghq_hirs(HiResPackFormat_None),
ghq_enht_cmpr(0), m_ghq_enht_cmpr(false),
ghq_enht_f16bpp(0), ghq_enht_f16bpp(0),
ghq_enht_gz(0), ghq_enht_gz(0),
ghq_enht_nobg(0), ghq_enht_nobg(0),
@ -139,7 +139,7 @@ void CSettings::RegisterSettings(void)
general_setting(Set_ghq_cmpr, "ghq_cmpr", TextureCompression_S3TC); general_setting(Set_ghq_cmpr, "ghq_cmpr", TextureCompression_S3TC);
general_setting(Set_ghq_enht, "ghq_enht", TextureEnht_None); general_setting(Set_ghq_enht, "ghq_enht", TextureEnht_None);
general_setting(Set_ghq_hirs, "ghq_hirs", HiResPackFormat_None); general_setting(Set_ghq_hirs, "ghq_hirs", HiResPackFormat_None);
general_setting(Set_ghq_enht_cmpr, "ghq_enht_cmpr", 0); general_setting(Set_ghq_enht_cmpr, "ghq_enht_cmpr", false);
general_setting(Set_ghq_enht_f16bpp, "ghq_enht_f16bpp", 0); general_setting(Set_ghq_enht_f16bpp, "ghq_enht_f16bpp", 0);
general_setting(Set_ghq_enht_gz, "ghq_enht_gz", 1); general_setting(Set_ghq_enht_gz, "ghq_enht_gz", 1);
general_setting(Set_ghq_enht_nobg, "ghq_enht_nobg", 0); general_setting(Set_ghq_enht_nobg, "ghq_enht_nobg", 0);
@ -361,6 +361,15 @@ void CSettings::SetGhqHirs(HiResPackFormat_t value)
} }
} }
void CSettings::SetGhqEnhtCmpr(bool value)
{
if (value != m_ghq_enht_cmpr)
{
m_ghq_enht_cmpr = value;
m_dirty = true;
}
}
void CSettings::UpdateFrameBufferBits(uint32_t BitsToAdd, uint32_t BitsToRemove) void CSettings::UpdateFrameBufferBits(uint32_t BitsToAdd, uint32_t BitsToRemove)
{ {
uint32_t frame_buffer_original = m_frame_buffer; uint32_t frame_buffer_original = m_frame_buffer;
@ -467,7 +476,7 @@ void CSettings::ReadSettings()
m_ghq_cmpr = (TextureCompression_t)GetSetting(Set_ghq_cmpr); m_ghq_cmpr = (TextureCompression_t)GetSetting(Set_ghq_cmpr);
m_ghq_enht = (TextureEnhancement_t)GetSetting(Set_ghq_enht); m_ghq_enht = (TextureEnhancement_t)GetSetting(Set_ghq_enht);
m_ghq_hirs = (HiResPackFormat_t)GetSetting(Set_ghq_hirs); m_ghq_hirs = (HiResPackFormat_t)GetSetting(Set_ghq_hirs);
this->ghq_enht_cmpr = GetSetting(Set_ghq_enht_cmpr); m_ghq_enht_cmpr = GetSetting(Set_ghq_enht_cmpr) != 0;
this->ghq_enht_f16bpp = GetSetting(Set_ghq_enht_f16bpp); this->ghq_enht_f16bpp = GetSetting(Set_ghq_enht_f16bpp);
this->ghq_enht_gz = GetSetting(Set_ghq_enht_gz); this->ghq_enht_gz = GetSetting(Set_ghq_enht_gz);
this->ghq_enht_nobg = GetSetting(Set_ghq_enht_nobg); this->ghq_enht_nobg = GetSetting(Set_ghq_enht_nobg);
@ -736,7 +745,7 @@ void CSettings::WriteSettings(void)
SetSetting(Set_ghq_cmpr, m_ghq_cmpr); SetSetting(Set_ghq_cmpr, m_ghq_cmpr);
SetSetting(Set_ghq_enht, m_ghq_enht); SetSetting(Set_ghq_enht, m_ghq_enht);
SetSetting(Set_ghq_hirs, m_ghq_hirs); SetSetting(Set_ghq_hirs, m_ghq_hirs);
SetSetting(Set_ghq_enht_cmpr, g_settings->ghq_enht_cmpr); SetSetting(Set_ghq_enht_cmpr, m_ghq_enht_cmpr);
SetSetting(Set_ghq_enht_f16bpp, g_settings->ghq_enht_f16bpp); SetSetting(Set_ghq_enht_f16bpp, g_settings->ghq_enht_f16bpp);
SetSetting(Set_ghq_enht_gz, g_settings->ghq_enht_gz); SetSetting(Set_ghq_enht_gz, g_settings->ghq_enht_gz);
SetSetting(Set_ghq_enht_nobg, g_settings->ghq_enht_nobg); SetSetting(Set_ghq_enht_nobg, g_settings->ghq_enht_nobg);

4
Source/Glide64/Settings.h
View File

@ -207,7 +207,7 @@ public:
inline TextureEnhancement_t ghq_enht(void) const { return m_ghq_enht; } inline TextureEnhancement_t ghq_enht(void) const { return m_ghq_enht; }
inline TextureCompression_t ghq_cmpr(void) const { return m_ghq_cmpr; } inline TextureCompression_t ghq_cmpr(void) const { return m_ghq_cmpr; }
inline HiResPackFormat_t ghq_hirs(void) const { return m_ghq_hirs; } inline HiResPackFormat_t ghq_hirs(void) const { return m_ghq_hirs; }
int ghq_enht_cmpr; inline bool ghq_enht_cmpr(void) const { return m_ghq_enht_cmpr; }
int ghq_enht_f16bpp; int ghq_enht_f16bpp;
int ghq_enht_gz; int ghq_enht_gz;
int ghq_enht_nobg; int ghq_enht_nobg;
@ -276,6 +276,7 @@ public:
void SetGhqEnht(TextureEnhancement_t value); void SetGhqEnht(TextureEnhancement_t value);
void SetGhqCmpr(TextureCompression_t value); void SetGhqCmpr(TextureCompression_t value);
void SetGhqHirs(HiResPackFormat_t value); void SetGhqHirs(HiResPackFormat_t value);
void SetGhqEnhtCmpr(bool value);
void UpdateFrameBufferBits(uint32_t BitsToAdd, uint32_t BitsToRemove); void UpdateFrameBufferBits(uint32_t BitsToAdd, uint32_t BitsToRemove);
ucode_t DetectUCode(uint32_t uc_crc); ucode_t DetectUCode(uint32_t uc_crc);
void SetUcode(ucode_t value); void SetUcode(ucode_t value);
@ -320,6 +321,7 @@ private:
TextureEnhancement_t m_ghq_enht; TextureEnhancement_t m_ghq_enht;
TextureCompression_t m_ghq_cmpr; TextureCompression_t m_ghq_cmpr;
HiResPackFormat_t m_ghq_hirs; HiResPackFormat_t m_ghq_hirs;
bool m_ghq_enht_cmpr;
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;