mirror of
https://github.com/blawar/GLideN64.git
synced 2024-06-25 22:09:35 +00:00
Remove ValidityCheckMethod from config and UI.
Up config version.
This commit is contained in:
Sergey Lipskiy
parent
8e096a8db9
commit
2604b57bf1
|
|
@ -1,5 +1,5 @@
|
|||
[General]
|
||||
version=3
|
||||
version=4
|
||||
|
||||
[video]
|
||||
fullscreenWidth=640
|
||||
|
|
@ -30,7 +30,6 @@ copyFromRDRAM=0
|
|||
detectCFB=0
|
||||
N64DepthCompare=0
|
||||
aspect=1
|
||||
validityCheckMethod=0
|
||||
|
||||
[textureFilter]
|
||||
txFilterMode=0
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ void Config::resetToDefaults()
|
|||
frameBufferEmulation.detectCFB = 0;
|
||||
frameBufferEmulation.N64DepthCompare = 0;
|
||||
frameBufferEmulation.aspect = 1;
|
||||
frameBufferEmulation.validityCheckMethod = vcFingerprint;
|
||||
|
||||
textureFilter.txCacheSize = 100 * gc_uMegabyte;
|
||||
textureFilter.txDump = 0;
|
||||
|
|
|
|||
10
src/Config.h
10
src/Config.h
|
|
@ -7,7 +7,8 @@
|
|||
#define CONFIG_VERSION_ONE 1U
|
||||
#define CONFIG_VERSION_TWO 2U
|
||||
#define CONFIG_VERSION_THREE 3U
|
||||
#define CONFIG_VERSION_CURRENT CONFIG_VERSION_THREE
|
||||
#define CONFIG_VERSION_FOUR 4U // Remove ValidityCheckMethod setting
|
||||
#define CONFIG_VERSION_CURRENT CONFIG_VERSION_FOUR
|
||||
|
||||
#define BILINEAR_3POINT 0
|
||||
#define BILINEAR_STANDARD 1
|
||||
|
|
@ -60,12 +61,6 @@ struct Config
|
|||
aTotal = 4
|
||||
};
|
||||
|
||||
enum ValidityCheckMethod {
|
||||
vcFingerprint = 0,
|
||||
vcFill = 1,
|
||||
vcTotal = 2
|
||||
};
|
||||
|
||||
struct {
|
||||
u32 enable;
|
||||
u32 copyToRDRAM;
|
||||
|
|
@ -74,7 +69,6 @@ struct Config
|
|||
u32 detectCFB;
|
||||
u32 N64DepthCompare;
|
||||
u32 aspect; // 0: stretch ; 1: 4/3 ; 2: 16/9; 3: adjust
|
||||
u32 validityCheckMethod; // 0=write fingerprint to the buffer, 1=fill whole buffer in RDRAM with test value
|
||||
} frameBufferEmulation;
|
||||
|
||||
struct
|
||||
|
|
|
|||
|
|
@ -133,14 +133,6 @@ void ConfigDialog::_init()
|
|||
ui->aspectAdjustRadioButton->setChecked(true);
|
||||
break;
|
||||
}
|
||||
switch (config.frameBufferEmulation.validityCheckMethod) {
|
||||
case Config::vcFill:
|
||||
ui->validityMethodFillRadioButton->setChecked(true);
|
||||
break;
|
||||
case Config::vcFingerprint:
|
||||
ui->validityMethodFingerprintRadioButton->setChecked(true);
|
||||
break;
|
||||
}
|
||||
|
||||
// Texture filter settings
|
||||
QStringList textureFiltersList;
|
||||
|
|
@ -305,11 +297,6 @@ void ConfigDialog::accept()
|
|||
else if (ui->aspectAdjustRadioButton->isChecked())
|
||||
config.frameBufferEmulation.aspect = Config::aAdjust;
|
||||
|
||||
if (ui->validityMethodFillRadioButton->isChecked())
|
||||
config.frameBufferEmulation.validityCheckMethod = Config::vcFill;
|
||||
else if (ui->validityMethodFingerprintRadioButton->isChecked())
|
||||
config.frameBufferEmulation.validityCheckMethod = Config::vcFingerprint;
|
||||
|
||||
// Texture filter settings
|
||||
config.textureFilter.txFilterMode = ui->filterComboBox->currentIndex();
|
||||
config.textureFilter.txEnhancementMode = ui->enhancementComboBox->currentIndex();
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ void _loadSettings(QSettings & settings)
|
|||
config.frameBufferEmulation.detectCFB = settings.value("detectCFB", config.frameBufferEmulation.detectCFB).toInt();
|
||||
config.frameBufferEmulation.N64DepthCompare = settings.value("N64DepthCompare", config.frameBufferEmulation.N64DepthCompare).toInt();
|
||||
config.frameBufferEmulation.aspect = settings.value("aspect", config.frameBufferEmulation.aspect).toInt();
|
||||
config.frameBufferEmulation.validityCheckMethod = settings.value("validityCheckMethod", config.frameBufferEmulation.validityCheckMethod).toInt();
|
||||
settings.endGroup();
|
||||
|
||||
settings.beginGroup("textureFilter");
|
||||
|
|
@ -154,7 +153,6 @@ void writeSettings(const QString & _strIniFolder)
|
|||
settings.setValue("detectCFB", config.frameBufferEmulation.detectCFB);
|
||||
settings.setValue("N64DepthCompare", config.frameBufferEmulation.N64DepthCompare);
|
||||
settings.setValue("aspect", config.frameBufferEmulation.aspect);
|
||||
settings.setValue("validityCheckMethod", config.frameBufferEmulation.validityCheckMethod);
|
||||
settings.endGroup();
|
||||
|
||||
settings.beginGroup("textureFilter");
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<string>GLideN64 settings</string>
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset>
|
||||
<iconset resource="icon.qrc">
|
||||
<normaloff>:/Icon.png</normaloff>:/Icon.png</iconset>
|
||||
</property>
|
||||
<property name="modal">
|
||||
|
|
@ -680,46 +680,6 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_9">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_24">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p><span style=" font-weight:600;">Frame buffer validity check:</span></p><p>For hardware, frame buffer emulation it is essential to know that hardware frame buffer is still valid and can be used as texture. Frame buffer validity means that corresponded area in RDRAM is still used for that buffer. Plugin checks RDRAM context for changes before use of hardware buffer. There are two methods to check RDRAM context:</p><p>1. Write fingerprint to RDRAM. The plugin writes smal portion of data (fingerprint) to buffer area in RDRAM. It helps plugin to detect changes in RDRAM context. Small portion of modifications makes possibility of game crash very low.</p><p>2. Fill RDRAM. Plugin fills RDRAM area for allocated frame buffer with some test value. Frame buffer is valid until all pixels inside the area match that value. it is recommended method for Legend of Zelda.<br/>Warning: This method may cause emulator's crash if actual frame buffer bounds are less than the ones detected by the plugin.</p><p>[Recommended: Write fingerprint to RDRAM]</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Frame buffer validity check method:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="validityMethodFingerprintRadioButton">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p><span style=" font-weight:600;">Frame buffer validity check:</span></p><p>For hardware, frame buffer emulation it is essential to know that hardware frame buffer is still valid and can be used as texture. Frame buffer validity means that corresponded area in RDRAM is still used for that buffer. Plugin checks RDRAM context for changes before use of hardware buffer. There are two methods to check RDRAM context:</p><p>1. Write fingerprint to RDRAM. The plugin writes smal portion of data (fingerprint) to buffer area in RDRAM. It helps plugin to detect changes in RDRAM context. Small portion of modifications makes possibility of game crash very low.</p><p>2. Fill RDRAM. Plugin fills RDRAM area for allocated frame buffer with some test value. Frame buffer is valid until all pixels inside the area match that value. it is recommended method for Legend of Zelda.<br/>Warning: This method may cause emulator's crash if actual frame buffer bounds are less than the ones detected by the plugin.</p><p>[Recommended: Write fingerprint to RDRAM]</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>write fingerprint to RDRAM</string>
|
||||
</property>
|
||||
<attribute name="buttonGroup">
|
||||
<string notr="true">validityCheckbuttonGroup</string>
|
||||
</attribute>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="validityMethodFillRadioButton">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p><span style=" font-weight:600;">Frame buffer validity check:</span></p><p>For hardware, frame buffer emulation it is essential to know that hardware frame buffer is still valid and can be used as texture. Frame buffer validity means that corresponded area in RDRAM is still used for that buffer. Plugin checks RDRAM context for changes before use of hardware buffer. There are two methods to check RDRAM context:</p><p>1. Write fingerprint to RDRAM. The plugin writes smal portion of data (fingerprint) to buffer area in RDRAM. It helps plugin to detect changes in RDRAM context. Small portion of modifications makes possibility of game crash very low.</p><p>2. Fill RDRAM. Plugin fills RDRAM area for allocated frame buffer with some test value. Frame buffer is valid until all pixels inside the area match that value. it is recommended method for Legend of Zelda.<br/>Warning: This method may cause emulator's crash if actual frame buffer bounds are less than the ones detected by the plugin.</p><p>[Recommended: Write fingerprint to RDRAM]</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>fill buffer in RDRAM with test value</string>
|
||||
</property>
|
||||
<attribute name="buttonGroup">
|
||||
<string notr="true">validityCheckbuttonGroup</string>
|
||||
</attribute>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -1255,7 +1215,9 @@
|
|||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<resources>
|
||||
<include location="icon.qrc"/>
|
||||
</resources>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
|
|
@ -1372,9 +1334,8 @@
|
|||
</connections>
|
||||
<buttongroups>
|
||||
<buttongroup name="bilinearButtonGroup"/>
|
||||
<buttongroup name="screenshotButtonGroup"/>
|
||||
<buttongroup name="validityCheckbuttonGroup"/>
|
||||
<buttongroup name="bloomBlendModeButtonGroup"/>
|
||||
<buttongroup name="aspectButtonGroup"/>
|
||||
<buttongroup name="screenshotButtonGroup"/>
|
||||
</buttongroups>
|
||||
</ui>
|
||||
|
|
|
|||
|
|
@ -87,8 +87,6 @@ bool Config_SetDefault()
|
|||
assert(res == M64ERR_SUCCESS);
|
||||
res = ConfigSetDefaultBool(g_configVideoGliden64, "EnableN64DepthCompare", config.frameBufferEmulation.N64DepthCompare, "Enable N64 depth compare instead of OpenGL standard one. Experimental.");
|
||||
assert(res == M64ERR_SUCCESS);
|
||||
res = ConfigSetDefaultBool(g_configVideoGliden64, "ValidityCheckMethod", config.frameBufferEmulation.validityCheckMethod, "Method to check validity of auxiliary texture frame buffer (0=write fingerprint to the buffer, 1=fill whole buffer in RDRAM with test value)");
|
||||
assert(res == M64ERR_SUCCESS);
|
||||
//#Texture filter settings
|
||||
res = ConfigSetDefaultInt(g_configVideoGliden64, "txFilterMode", config.textureFilter.txFilterMode, "Texture filter (0=none, 1=Smooth filtering 1, 2=Smooth filtering 2, 3=Smooth filtering 3, 4=Smooth filtering 4, 5=Sharp filtering 1, 6=Sharp filtering 2)");
|
||||
assert(res == M64ERR_SUCCESS);
|
||||
|
|
@ -193,7 +191,6 @@ void Config_LoadConfig()
|
|||
config.frameBufferEmulation.copyFromRDRAM = ConfigGetParamBool(g_configVideoGliden64, "EnableCopyColorFromRDRAM");
|
||||
config.frameBufferEmulation.detectCFB = ConfigGetParamBool(g_configVideoGliden64, "EnableDetectCFB");
|
||||
config.frameBufferEmulation.N64DepthCompare = ConfigGetParamBool(g_configVideoGliden64, "EnableN64DepthCompare");
|
||||
config.frameBufferEmulation.validityCheckMethod = ConfigGetParamBool(g_configVideoGliden64, "ValidityCheckMethod");
|
||||
//#Texture filter settings
|
||||
config.textureFilter.txFilterMode = ConfigGetParamInt(g_configVideoGliden64, "txFilterMode");
|
||||
config.textureFilter.txEnhancementMode = ConfigGetParamInt(g_configVideoGliden64, "txEnhancementMode");
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user