[Glide64] Make ghq_cache_size private

Source/Glide64/Config.cpp

@@ -627,7 +627,7 @@ public:
         TTSetTxt(IDC_SPIN_TEXTURE_CACHE, tooltip.c_str());
         TTSetTxt(IDC_TEXT_MB, tooltip.c_str());
         m_textTexCache.Attach(GetDlgItem(IDC_TXT_TEXTURE_CACHE));
-        m_textTexCache.SetWindowTextA(stdstr_f("%d", g_settings->ghq_cache_size).c_str());
+        m_textTexCache.SetWindowTextA(stdstr_f("%d", g_settings->ghq_cache_size()).c_str());
         m_spinEnhCacheSize.Attach(GetDlgItem(IDC_SPIN_TEXTURE_CACHE));
         m_spinEnhCacheSize.SetBuddy(m_textTexCache);
 
@@ -690,7 +690,7 @@ public:
         CSettings oldsettings = *g_settings;
         g_settings->SetGhqFltr((CSettings::TextureFilter_t)m_cmbEnhFilter.GetItemData(m_cmbEnhFilter.GetCurSel()));
         g_settings->SetGhqEnht((CSettings::TextureEnhancement_t)m_cmbEnhEnhancement.GetItemData(m_cmbEnhEnhancement.GetCurSel()));
-        g_settings->ghq_cache_size = atoi(texcache);
+        g_settings->SetGhqCacheSize(atoi(texcache));
         g_settings->SetGhqEnhtNobg(m_cbxEnhIgnoreBG.GetCheck() == BST_CHECKED);
         g_settings->SetGhqEnhtCmpr(m_cbxEnhTexCompression.GetCheck() == BST_CHECKED);
         g_settings->SetGhqEnhtGz(m_cbxEnhCompressCache.GetCheck() == BST_CHECKED);

Source/Glide64/Main.cpp

@@ -706,7 +706,7 @@ int InitGfx()
                 voodoo.max_tex_size, // max texture height supported by hardware
                 voodoo.sup_32bit_tex ? 32 : 16, // max texture bpp supported by hardware
                 options,
-                g_settings->ghq_cache_size * 1024 * 1024, // cache texture to system memory
+                g_settings->ghq_cache_size() * 1024 * 1024, // cache texture to system memory
                 g_settings->texture_dir(),
                 rdp.RomName, // name of ROM. must be no longer than 256 characters
                 DisplayLoadProgress);

Source/Glide64/Settings.cpp

@@ -50,7 +50,7 @@ CSettings::CSettings() :
     m_ghq_hirs_gz(false),
     m_ghq_hirs_altcrc(false),
     m_ghq_cache_save(false),
-ghq_cache_size(0),
+    m_ghq_cache_size(0),
 ghq_hirs_let_texartists_fly(0),
 ghq_hirs_dump(0),
 autodetect_ucode(0),
@@ -442,6 +442,15 @@ void CSettings::SetGhqCacheSave(bool value)
     }
 }
 
+void CSettings::SetGhqCacheSize(int value)
+{
+    if (value != m_ghq_cache_size)
+    {
+        m_ghq_cache_size = value;
+        m_dirty = true;
+    }
+}
+
 void CSettings::UpdateFrameBufferBits(uint32_t BitsToAdd, uint32_t BitsToRemove)
 {
     uint32_t frame_buffer_original = m_frame_buffer;
@@ -558,7 +567,7 @@ void CSettings::ReadSettings()
     m_ghq_hirs_gz = GetSetting(Set_ghq_hirs_gz) != 0;
     m_ghq_hirs_altcrc = GetSetting(Set_ghq_hirs_altcrc) != 0;
     m_ghq_cache_save = GetSetting(Set_ghq_cache_save) != 0;
-    this->ghq_cache_size = GetSetting(Set_ghq_cache_size);
+    m_ghq_cache_size = GetSetting(Set_ghq_cache_size);
     this->ghq_hirs_let_texartists_fly = GetSetting(Set_ghq_hirs_let_texartists_fly);
     this->ghq_hirs_dump = GetSetting(Set_ghq_hirs_dump);
 
@@ -827,7 +836,7 @@ void CSettings::WriteSettings(void)
     SetSetting(Set_ghq_hirs_gz, m_ghq_hirs_gz);
     SetSetting(Set_ghq_hirs_altcrc, m_ghq_hirs_altcrc);
     SetSetting(Set_ghq_cache_save, m_ghq_cache_save);
-    SetSetting(Set_ghq_cache_size, g_settings->ghq_cache_size);
+    SetSetting(Set_ghq_cache_size, m_ghq_cache_size);
     SetSetting(Set_ghq_hirs_let_texartists_fly, g_settings->ghq_hirs_let_texartists_fly);
     SetSetting(Set_ghq_hirs_dump, g_settings->ghq_hirs_dump);
 

Source/Glide64/Settings.h

@@ -217,7 +217,7 @@ public:
     inline bool ghq_hirs_gz(void) const { return m_ghq_hirs_gz; }
     inline bool ghq_hirs_altcrc(void) const { return m_ghq_hirs_altcrc; }
     inline bool ghq_cache_save(void) const { return m_ghq_cache_save; }
-    int ghq_cache_size;
+    inline int ghq_cache_size(void) const { return m_ghq_cache_size; }
     int ghq_hirs_let_texartists_fly;
     int ghq_hirs_dump;
 
@@ -261,8 +261,9 @@ public:
 #endif
     int wrpVRAM;
     int wrpFBO;
-    inline bool FlushLogs(void) const { return m_FlushLogs; }
     int wrpAnisotropic;
+    inline bool FlushLogs(void) const { return m_FlushLogs; }
+
     void SetTexenhOptions(bool value);
     void SetScreenRes(uint32_t value);
     void SetAspectmode(AspectMode_t value);
@@ -285,18 +286,19 @@ public:
     void SetGhqHirsCmpr(bool value);
     void SetGhqHirsGz(bool value);
     void SetGhqCacheSave(bool value);
+    void SetGhqCacheSize(int value);
     void UpdateFrameBufferBits(uint32_t BitsToAdd, uint32_t BitsToRemove);
     ucode_t DetectUCode(uint32_t uc_crc);
     void SetUcode(ucode_t value);
 
+    void ReadSettings();
     void ReadGameSettings(const char * name);
     void WriteSettings(void);
-    void UpdateAspectRatio(void);
     void UpdateScreenSize(bool fullscreen);
 
 private:
-    void ReadSettings();
     void RegisterSettings(void);
+    void UpdateAspectRatio(void);
     void SettingsChanged(void);
     
     static void stSettingsChanged(void * _this)
@@ -339,6 +341,7 @@ private:
     bool m_ghq_hirs_gz;
     bool m_ghq_hirs_altcrc;
     bool m_ghq_cache_save;
+    int m_ghq_cache_size;
     ucode_t m_ucode;
     StippleMode_t m_stipple_mode;
     hacks_t m_hacks;