mirror of
https://github.com/blawar/GLideN64.git
synced 2024-07-05 10:33:37 +00:00
Allow mupen64plus to read GLideN64.custom.ini
This commit is contained in:
Logan McNaughton
Sergey Lipskiy
parent
16f556e1a5
commit
eb3c5c0730
|
|
@ -244,9 +244,37 @@ typedef const char * (*ptr_ConfigGetUserCachePath)(void);
|
|||
EXPORT const char * CALL ConfigGetUserCachePath(void);
|
||||
#endif
|
||||
|
||||
/* ConfigExternalOpen()
|
||||
*
|
||||
* This function reads the contents of the config file into memory
|
||||
* and returns M64ERR_SUCCESS if successful.
|
||||
*/
|
||||
typedef m64p_error (*ptr_ConfigExternalOpen)(const char *, m64p_handle *);
|
||||
#if defined(M64P_CORE_PROTOTYPES)
|
||||
EXPORT m64p_error CALL ConfigExternalOpen(const char *, m64p_handle *);
|
||||
#endif
|
||||
|
||||
/* ConfigExternalClose()
|
||||
*
|
||||
* Frees the memory pointer created by ConfigExternalOpen.
|
||||
*/
|
||||
typedef m64p_error (*ptr_ConfigExternalClose)(m64p_handle);
|
||||
#if defined(M64P_CORE_PROTOTYPES)
|
||||
EXPORT m64p_error CALL ConfigExternalClose(m64p_handle);
|
||||
#endif
|
||||
|
||||
/* ConfigExternalGetParameter()
|
||||
*
|
||||
* This functions allows a plugin to leverage the built-in ini parser to read
|
||||
* any cfg/ini file. It will return M64ERR_SUCCESS if the item was found.
|
||||
*/
|
||||
typedef m64p_error (*ptr_ConfigExternalGetParameter)(m64p_handle, const char *, const char *, char *, int);
|
||||
#if defined(M64P_CORE_PROTOTYPES)
|
||||
EXPORT m64p_error CALL ConfigExternalGetParameter(m64p_handle, const char *, const char *, char *, int);
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* #define M64P_CONFIG_H */
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <osal_files.h>
|
||||
#include <algorithm>
|
||||
|
||||
#include "../Textures.h"
|
||||
#include "../Config.h"
|
||||
|
|
@ -184,6 +186,119 @@ bool Config_SetDefault()
|
|||
return ConfigSaveSection("Video-GLideN64") == M64ERR_SUCCESS;
|
||||
}
|
||||
|
||||
void Config_LoadCustomConfig()
|
||||
{
|
||||
if (ConfigExternalGetParameter == nullptr || ConfigExternalOpen == nullptr || ConfigExternalClose == nullptr)
|
||||
return;
|
||||
char value[PATH_MAX];
|
||||
m64p_error result;
|
||||
std::string ROMname = RSP.romname;
|
||||
const char* pathName = ConfigGetSharedDataFilepath("GLideN64.custom.ini");
|
||||
if (pathName == nullptr)
|
||||
return;
|
||||
for (size_t pos = ROMname.find(' '); pos != std::string::npos; pos = ROMname.find(' ', pos))
|
||||
ROMname.replace(pos, 1, "%20");
|
||||
for (size_t pos = ROMname.find('\''); pos != std::string::npos; pos = ROMname.find('\'', pos))
|
||||
ROMname.replace(pos, 1, "%27");
|
||||
std::transform(ROMname.begin(), ROMname.end(), ROMname.begin(), ::toupper);
|
||||
const char* sectionName = ROMname.c_str();
|
||||
m64p_handle fileHandle;
|
||||
result = ConfigExternalOpen(pathName, &fileHandle);
|
||||
if (result != M64ERR_SUCCESS)
|
||||
return;
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "video\\fullscreenWidth", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.video.fullscreenWidth = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "video\\fullscreenHeight", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.video.fullscreenHeight = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "video\\windowedWidth", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.video.windowedWidth = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "video\\windowedHeight", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.video.windowedHeight = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "video\\fullscreenRefresh", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.video.fullscreenRefresh = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "video\\multisampling", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.video.multisampling = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "video\\cropMode", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.video.cropMode = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "video\\cropWidth", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.video.cropWidth = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "video\\cropHeight", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.video.cropHeight = atoi(value);
|
||||
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "texture\\maxAnisotropy", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.texture.maxAnisotropy = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "texture\\bilinearMode", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.texture.bilinearMode = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "texture\\maxBytes", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.texture.maxBytes = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "texture\\screenShotFormat", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.texture.screenShotFormat = atoi(value);
|
||||
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "generalEmulation\\enableNoise", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.generalEmulation.enableNoise = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "generalEmulation\\enableLOD", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.generalEmulation.enableLOD = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "generalEmulation\\enableHWLighting", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.generalEmulation.enableHWLighting = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "generalEmulation\\enableShadersStorage", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.generalEmulation.enableShadersStorage = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "generalEmulation\\correctTexrectCoords", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.generalEmulation.correctTexrectCoords = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "generalEmulation\\enableNativeResTexrects", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.generalEmulation.enableNativeResTexrects = atoi(value);
|
||||
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "frameBufferEmulation\\enable", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.frameBufferEmulation.enable = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "frameBufferEmulation\\aspect", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.frameBufferEmulation.aspect = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "frameBufferEmulation\\nativeResFactor", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.frameBufferEmulation.nativeResFactor = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "frameBufferEmulation\\bufferSwapMode", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.frameBufferEmulation.bufferSwapMode = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "frameBufferEmulation\\N64DepthCompare", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.frameBufferEmulation.N64DepthCompare = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "frameBufferEmulation\\copyAuxToRDRAM", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.frameBufferEmulation.copyAuxToRDRAM = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "frameBufferEmulation\\copyToRDRAM", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.frameBufferEmulation.copyToRDRAM = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "frameBufferEmulation\\copyDepthToRDRAM", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.frameBufferEmulation.copyDepthToRDRAM = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "frameBufferEmulation\\copyFromRDRAM", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.frameBufferEmulation.copyFromRDRAM = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "frameBufferEmulation\\fbInfoDisabled", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.frameBufferEmulation.fbInfoDisabled = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "frameBufferEmulation\\fbInfoReadColorChunk", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.frameBufferEmulation.fbInfoReadColorChunk = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "frameBufferEmulation\\fbInfoReadDepthChunk", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.frameBufferEmulation.fbInfoReadDepthChunk = atoi(value);
|
||||
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "textureFilter\\txFilterMode", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.textureFilter.txFilterMode = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "textureFilter\\txEnhancementMode", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.textureFilter.txEnhancementMode = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "textureFilter\\txDeposterize", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.textureFilter.txDeposterize = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "textureFilter\\txFilterIgnoreBG", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.textureFilter.txFilterIgnoreBG = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "textureFilter\\txCacheSize", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.textureFilter.txCacheSize = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "textureFilter\\txHiresEnable", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.textureFilter.txHiresEnable = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "textureFilter\\txHiresFullAlphaChannel", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.textureFilter.txHiresFullAlphaChannel = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "textureFilter\\txHresAltCRC", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.textureFilter.txHresAltCRC = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "textureFilter\\txDump", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.textureFilter.txDump = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "textureFilter\\txForce16bpp", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.textureFilter.txForce16bpp = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "textureFilter\\txCacheCompression", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.textureFilter.txCacheCompression = atoi(value);
|
||||
result = ConfigExternalGetParameter(fileHandle, sectionName, "textureFilter\\txSaveCache", value, sizeof(value));
|
||||
if (result == M64ERR_SUCCESS) config.textureFilter.txSaveCache = atoi(value);
|
||||
ConfigExternalClose(fileHandle);
|
||||
}
|
||||
|
||||
void Config_LoadConfig()
|
||||
{
|
||||
const u32 hacks = config.generalEmulation.hacks;
|
||||
|
|
@ -299,5 +414,7 @@ void Config_LoadConfig()
|
|||
config.onScreenDisplay.percent = ConfigGetParamBool(g_configVideoGliden64, "ShowPercent");
|
||||
config.onScreenDisplay.pos = ConfigGetParamInt(g_configVideoGliden64, "CountersPos");
|
||||
|
||||
if (config.generalEmulation.enableCustomSettings)
|
||||
Config_LoadCustomConfig();
|
||||
config.generalEmulation.hacks = hacks;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,9 @@ extern ptr_ConfigGetParamInt ConfigGetParamInt;
|
|||
extern ptr_ConfigGetParamFloat ConfigGetParamFloat;
|
||||
extern ptr_ConfigGetParamBool ConfigGetParamBool;
|
||||
extern ptr_ConfigGetParamString ConfigGetParamString;
|
||||
extern ptr_ConfigExternalGetParameter ConfigExternalGetParameter;
|
||||
extern ptr_ConfigExternalOpen ConfigExternalOpen;
|
||||
extern ptr_ConfigExternalClose ConfigExternalClose;
|
||||
|
||||
extern ptr_ConfigGetSharedDataFilepath ConfigGetSharedDataFilepath;
|
||||
extern ptr_ConfigGetUserConfigPath ConfigGetUserConfigPath;
|
||||
|
|
|
|||
|
|
@ -26,6 +26,9 @@ ptr_ConfigGetParamInt ConfigGetParamInt = nullptr;
|
|||
ptr_ConfigGetParamFloat ConfigGetParamFloat = nullptr;
|
||||
ptr_ConfigGetParamBool ConfigGetParamBool = nullptr;
|
||||
ptr_ConfigGetParamString ConfigGetParamString = nullptr;
|
||||
ptr_ConfigExternalGetParameter ConfigExternalGetParameter = nullptr;
|
||||
ptr_ConfigExternalOpen ConfigExternalOpen = nullptr;
|
||||
ptr_ConfigExternalClose ConfigExternalClose = nullptr;
|
||||
|
||||
/* definitions of pointers to Core video extension functions */
|
||||
ptr_VidExt_Init CoreVideo_Init = nullptr;
|
||||
|
|
@ -61,6 +64,9 @@ m64p_error PluginAPI::PluginStartup(m64p_dynlib_handle _CoreLibHandle)
|
|||
ConfigGetParamFloat = (ptr_ConfigGetParamFloat)DLSYM(_CoreLibHandle, "ConfigGetParamFloat");
|
||||
ConfigGetParamBool = (ptr_ConfigGetParamBool)DLSYM(_CoreLibHandle, "ConfigGetParamBool");
|
||||
ConfigGetParamString = (ptr_ConfigGetParamString)DLSYM(_CoreLibHandle, "ConfigGetParamString");
|
||||
ConfigExternalGetParameter = (ptr_ConfigExternalGetParameter)DLSYM(_CoreLibHandle, "ConfigExternalGetParameter");
|
||||
ConfigExternalOpen = (ptr_ConfigExternalOpen)DLSYM(_CoreLibHandle, "ConfigExternalOpen");
|
||||
ConfigExternalClose = (ptr_ConfigExternalClose)DLSYM(_CoreLibHandle, "ConfigExternalClose");
|
||||
|
||||
/* Get the core Video Extension function pointers from the library handle */
|
||||
CoreVideo_Init = (ptr_VidExt_Init) DLSYM(_CoreLibHandle, "VidExt_Init");
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user