Max/PDModdingCommunity_PD-Loader
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases 5 Wiki Activity

Novidia: remove shader_amd_farc option, add config for shader_delta_patches, use diva filesystem funcs to read shader.farc for (hopefully) less interference with possible future plugins

Browse Source
This commit is contained in:
somewhatlurker
2020-11-13 20:32:27 +11:00
parent ace0cdacbb
commit 5f5346cee4
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source-code/source/plugins/Novidia/src/dllmain.cpp
+20 -12
View File
@@ -241,20 +241,24 @@ int64_t hookedGetFileSize(MsString* path) {
// if shader, open it and read data
if (fopen_s(&ogfile, path->GetCharBuf(), "rb") != 0)
//if (fopen_s(&ogfile, path->GetCharBuf(), "rb") != 0)
ogfile = divaFsopen(path->GetCharBuf(), "rb", _SH_DENYNO);
if (ogfile == nullptr)
{
MessageBoxW(NULL, L"Error opening shader.farc.", L"Novidia", NULL);
goto fail;
}
ogdata = malloc(ogsize);
if (fread(ogdata, 1, ogsize, ogfile) != ogsize)
//if (fread(ogdata, 1, ogsize, ogfile) != ogsize)
if (divaFread(ogdata, 1, ogsize, ogfile) != ogsize)
{
MessageBoxW(NULL, L"Error reading shader.farc.", L"Novidia", NULL);
goto fail;
}
fclose(ogfile);
//fclose(ogfile);
divaFclose(ogfile); // need to use diva's fclose if using diva's fsopen and fread
// crc32 the shader data to find a vcdiff patch file
@@ -327,7 +331,7 @@ fail:
if (outbuf) free(outbuf);
return ogsize;
}
FILE* hookedFsopen(char* path, char* mode, int* shflag)
FILE* hookedFsopen(const char* path, const char* mode, int shflag)
{
FILE* res = divaFsopen(path, mode, shflag);
@@ -398,21 +402,25 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
DetourAttach(&(PVOID&)uploadModelTransformBuf, h_uploadModelTransformBuf_NoUpload);
}
printf("[Novidia] Hooking divaGetFileSize\n");
DetourAttach(&(PVOID&)divaGetFileSize, hookedGetFileSize);
printf("[Novidia] Hooking divaFsopen\n");
DetourAttach(&(PVOID&)divaFsopen, hookedFsopen);
printf("[Novidia] Hooking divaFread\n");
DetourAttach(&(PVOID&)divaFread, hookedFread);
if (enable_shader_deltas)
{
printf("[Novidia] Hooking divaGetFileSize\n");
DetourAttach(&(PVOID&)divaGetFileSize, hookedGetFileSize);
printf("[Novidia] Hooking divaFsopen\n");
DetourAttach(&(PVOID&)divaFsopen, hookedFsopen);
printf("[Novidia] Hooking divaFread\n");
DetourAttach(&(PVOID&)divaFread, hookedFread);
}
DetourTransactionCommit();
/*
if (shader_amd_farc)
{
const char* shaderpath = "./rom/shader_amd.farc";
InjectCode((void*)0x140a41018, std::vector<uint8_t>(shaderpath, shaderpath + strlen(shaderpath)));
}
*/
}
return TRUE;
@@ -426,7 +434,7 @@ PluginConfigOption config[] = {
{ CONFIG_BOOLEAN, new PluginConfigBooleanData{ L"enable_chara_skinning", L"general", CONFIG_FILE, L"Enable Chara Skinning", L"If you really need to get extra performance, you can disable uploading skinning data. (character models will disappear)", true, false } },
{ CONFIG_BOOLEAN, new PluginConfigBooleanData{ L"use_TexSubImage", L"general", CONFIG_FILE, L"Use glTexSubImage", L"glTexSubImage should offer higher performance, but stuttering has been reported when it is used.\nTry disabling this if you have issues.", true, false } },
{ CONFIG_BOOLEAN, new PluginConfigBooleanData{ L"force_BGRA_upload", L"general", CONFIG_FILE, L"Force BGRA Texture Uploads", L"BGRA format uploads seem to run faster (on some hardware), but drivers may suggest RGBA instead.\nUsing this forces uploads to use the BGRA format.\n\nDisabling this may decrease or improve performance.", true, false } },
{ CONFIG_BOOLEAN, new PluginConfigBooleanData{ L"shader_amd_farc", L"general", CONFIG_FILE, L"Load shader_amd.farc", L"Novidia can manage loading of alternate shaders automatically.\nLeave this enabled for current and future versions of AMDPack.", true, false } },
{ CONFIG_BOOLEAN, new PluginConfigBooleanData{ L"shader_delta_patches", L"general", CONFIG_FILE, L"Apply shader vcdiff patches", L"Novidia can automatically apply pre-generated delta patch files to shaders.\nLeave this enabled for current and future versions of AMDPack.", true, false } },
};
extern "C" __declspec(dllexport) LPCWSTR GetPluginName(void)
source-code/source/plugins/Novidia/src/framework.h
+10 -3
View File
@@ -28,7 +28,6 @@ bool enable_chara_skinning;
bool use_TexSubImage;
bool force_BGRA_upload;
GLint tex_upload_format;
bool shader_amd_farc;
struct MsString {
union {
@@ -65,10 +64,12 @@ std::string shader_farc_path = "";
void* shader_farc_data = NULL;
int64_t shader_farc_data_size;
FILE* shader_file_handle = NULL;
bool enable_shader_deltas;
int64_t(*divaGetFileSize)(MsString* path) = (int64_t(*)(MsString* path))0x1400abb20;
FILE* (*divaFsopen)(char* path, char* mode, int* shflag) = (FILE* (*)(char* path, char* mode, int* shflag))0x14085a17c;
FILE* (*divaFsopen)(const char* path, const char* mode, int shflag) = (FILE* (*)(const char* path, const char* mode, int shflag))0x14085a17c;
int64_t(*divaFread)(void* dst, int64_t size, int64_t count, FILE* file) = (int64_t(*)(void* dst, int64_t size, int64_t count, FILE* file))0x14085a6c4;
int(*divaFclose)(FILE* file) = (int(*)(FILE* file))0x140846e9c; // not hooked, just so it can be called
std::wstring ExePath() {
WCHAR buffer[MAX_PATH];
@@ -91,7 +92,13 @@ void loadConfig()
enable_chara_skinning = GetPrivateProfileIntW(L"general", L"enable_chara_skinning", 1, CONFIG_FILE) > 0 ? true : false;
use_TexSubImage = GetPrivateProfileIntW(L"general", L"use_TexSubImage", 1, CONFIG_FILE) > 0 ? true : false;
force_BGRA_upload = GetPrivateProfileIntW(L"general", L"force_BGRA_upload", 1, CONFIG_FILE) > 0 ? true : false;
shader_amd_farc = GetPrivateProfileIntW(L"general", L"shader_amd_farc", 1, CONFIG_FILE) > 0 ? true : false;
enable_shader_deltas = GetPrivateProfileIntW(L"general", L"shader_delta_patches", 1, CONFIG_FILE) > 0 ? true : false;
if (GetPrivateProfileIntW(L"general", L"shader_amd_farc", 0, CONFIG_FILE) > 0)
{
MessageBoxA(NULL, "Attention: Use of shader_amd.farc has been discontinued and will no longer work. MAMD mdata is not required and can be deleted.\n\nIf you use modded shaders, amd-tools has been updated so it can generate new patches. Please check the readme for more information.", "Novidia", 0);
WritePrivateProfileStringW(L"general", L"shader_amd_farc", L"0", CONFIG_FILE);
}
}