Merge pull request #17 from korenkonder/dev

[TLAC]: Pause patches. Fix of stuff moving 1 frame after pause

source-code/data/plugins/ShaderPatch.ini

@@ -37,13 +37,13 @@ Toon_Lines_Improve_Val3=0.75
 [Patches]
 # Compatibility patches:
 # Star Story (and etc.) stage corruption (Maxwell+)
-blinn_per_vert\.0010010[23]00[01]\.fp=arch:GA,TU,GP,GV,GM||cfg:compat||from:TEX tex_col, a_tex_color0, texture\[0\], 2D; ALIAS||to:TEX tex_col, a_tex_color0, texture[0], 2D; MUL tex_col, 1, tex_col; ALIAS
+blinn_per_vert\.0010010[23]00[01]\.fp=arch:AD,GA,GV,TU,GP,GM||cfg:compat||from:TEX tex_col, a_tex_color0, texture\[0\], 2D; ALIAS||to:TEX tex_col, a_tex_color0, texture[0], 2D; MUL tex_col, 1, tex_col; ALIAS
 # Turing shading lines (new patch by samyuu, hopefully ported to here correctly)
-.*=arch:GA,TU||cfg:compat||from:SHORT ||to:
+.*=arch:AD,GA,GV,TU||cfg:compat||from:SHORT ||to:
 # Turing NPR cloth noise
-cloth_npr1.*=arch:GA,TU||cfg:compat||from:SSG _tmp0.yw, ybr.xxzz;||to:TEMP _tmpForSSG; SGE _tmpForSSG.xz, ybr.xxzz, 0; SUB _tmpForSSG.xz, _tmpForSSG.xxzz, 1; SGT _tmpForSSG.yw, ybr.xxzz, 0; ADD _tmp0.yw, _tmpForSSG.xxzz, _tmpForSSG.yyww;
+cloth_npr1.*=arch:AD,GA,GV,TU||cfg:compat||from:SSG _tmp0.yw, ybr.xxzz;||to:TEMP _tmpForSSG; SGE _tmpForSSG.xz, ybr.xxzz, 0; SUB _tmpForSSG.xz, _tmpForSSG.xxzz, 1; SGT _tmpForSSG.yw, ybr.xxzz, 0; ADD _tmp0.yw, _tmpForSSG.xxzz, _tmpForSSG.yyww;
 # Turing auto-exposure fix by samyuu
-stage_blinn.*\.fp=arch:GA,TU||cfg:compat||from:NRMH normal, a_normal;||to:NRM normal, a_normal;
+stage_blinn.*\.fp=arch:AD,GA,GV,TU||cfg:compat||from:NRMH normal, a_normal;||to:NRM normal, a_normal;
 
 # Lyb's toon shader improvements:
 cloth_npr1.*=cfg:toon_improve||from:MAD tmp.y, lc.z, 1.2, -0.5;||to:MAD tmp.y, lc.z, <val1>, <val2>;

source-code/data/plugins/config_template.bin

@@ -7,7 +7,7 @@
 Enable=1
 
 [GPU]
-# Force GPU model -- -1=auto, 0=Kepler, 1=Maxwell/Pascal, 2=Turing, 3=Ampere
+# Force GPU model -- -1=auto, 0=Kepler, 1=Maxwell/Pascal, 2=Turing, 3=Ampere, 4=Ada Lovelace
 Model=-1
 
 [Launcher]

source-code/dependencies/GPUModel/GPUModel.h

@@ -34,9 +34,9 @@ namespace GPUModel
 	// note that the used GL context may differ
 	std::string getGpuName()
 	{
-		// detected model can be overridden -- 0: Kepler, 1: Maxwell, 2: Turing, 3: Ampere
+		// detected model can be overridden -- 0: Kepler, 1: Maxwell, 2: Turing, 3: Ampere, 4: Ada Lovelace
 		int nGPUModel = GetPrivateProfileIntW(L"gpu", L"model", -1, CONFIG_FILE);
-		if (nGPUModel >= 0 && nGPUModel <= 3)
+		if (nGPUModel >= 0 && nGPUModel <= 4)
 		{
 			std::string arch;
 			switch (nGPUModel)
@@ -53,6 +53,9 @@ namespace GPUModel
 			case 3:
 				arch = "GA000";
 				break;
+			case 4:
+				arch = "AD000";
+				break;
 			}
 
 			printf("[GPUModel] GPU Model override: %s\n", arch.c_str());
@@ -65,7 +68,7 @@ namespace GPUModel
 		//DWORD dwAttrib = GetFileAttributesW(L"amdgfxinfo64.dll");
 		//if (dwAttrib != INVALID_FILE_ATTRIBUTES && !(dwAttrib & FILE_ATTRIBUTE_DIRECTORY))
 		struct stat buffer; // for some reason winapi version wasn't working
-		if (stat("amdgfxinfo64.dll", &buffer) == 0);
+		if (stat("amdgfxinfo64.dll", &buffer) == 0)
 		{
 			non_nv_name = "AMD";
 		}

source-code/source/plugins/Launcher/ConfigOption.h

@@ -609,6 +609,7 @@ public:
 	int _defaultVal;
 	int _indexOffset;
 	std::vector<LPCWSTR> _valueStrings;
+	System::IntPtr labelHandle;
 
 	DropdownOption(LPCWSTR iniVarName, LPCWSTR iniSectionName, LPCWSTR iniFilePath, LPCWSTR friendlyName, LPCWSTR description, int defaultVal, std::vector<LPCWSTR> valueStrings, int indexOffset=0)
 	{
@@ -628,6 +629,7 @@ public:
 		ComboBox^ combobox = gcnew ComboBox();
 
 		label->Text = gcnew String(_friendlyName);
+		labelHandle = label->Handle;
 		label->Left = left;
 		label->Top = top + 3;
 		label->Width = Col1Width;
@@ -1087,9 +1089,10 @@ class PluginOption : public ConfigOptionBase
 {
 public:
 	bool _defaultVal;
+	std::wstring _builddate;
 	std::vector<ConfigOptionBase*> _configopts;
 
-	PluginOption(LPCWSTR iniVarName, LPCWSTR iniSectionName, LPCWSTR iniFilePath, LPCWSTR friendlyName, LPCWSTR description, bool defaultVal, std::vector<ConfigOptionBase*> configopts)
+	PluginOption(LPCWSTR iniVarName, LPCWSTR iniSectionName, LPCWSTR iniFilePath, LPCWSTR friendlyName, LPCWSTR description, bool defaultVal, std::vector<ConfigOptionBase*> configopts, std::wstring builddate = L"Unknown")
 	{
 		_iniVarName = iniVarName;
 		_iniSectionName = iniSectionName;
@@ -1098,6 +1101,7 @@ public:
 		_description = description;
 		_defaultVal = defaultVal;
 		_configopts = configopts;
+		_builddate = builddate;
 	}
 
 	virtual int AddToPanel(Panel^ panel, unsigned int left, unsigned int top, ToolTip^ tooltip)

source-code/source/plugins/Launcher/framework.h

@@ -166,7 +166,7 @@ ConfigOptionBase* internalResolutionArray[] = {
 };
 
 ConfigOptionBase* graphicsArray[] = {
-	new DropdownOption(L"model", L"GPU", CONFIG_FILE, L"NVIDIA GPU:", L"Select your NVIDIA GPU's architecture to apply the necessary workarounds.\n\nNOTE: Automatic detection does not currently work on GNU/Linux.", -1, std::vector<LPCWSTR>({ L"Automatic", L"Kepler", L"Maxwell/Pascal", L"Turing", L"Ampere" }), -1),
+	new DropdownOption(L"model", L"GPU", CONFIG_FILE, L"Nvidia GPU:", L"Select your Nvidia GPU's architecture to apply the necessary workarounds.\n\nNOTE: Automatic detection does not currently work on GNU/Linux.", -1, std::vector<LPCWSTR>({ L"Automatic", L"Kepler", L"Maxwell/Pascal", L"Turing", L"Ampere", L"Ada or newer"}), -1),
 	new BooleanOption(L"TAA", GRAPHICS_SECTION, CONFIG_FILE, L"TAA", L"Temporal Anti-Aliasing", true, false),
 	new BooleanOption(L"MLAA", GRAPHICS_SECTION, CONFIG_FILE, L"MLAA", L"Morphological Anti-Aliasing", true, false),
 	new DropdownOption(L"MAG", GRAPHICS_SECTION, CONFIG_FILE, L"Filter:", L"Image filter.\n\nBilinear: default filter\nNearest-neighbour: sharpest, but blocky\nSharpen: sharp filter\nCone: smooth filter", 0, std::vector<LPCWSTR>({ L"Bilinear", L"Nearest-neighbour", L"Sharpen", L"Cone" })),
@@ -474,7 +474,7 @@ std::vector<PluginOption*> GetPluginOptions(std::vector<PluginInfo>* plugins)
 
 	for (PluginInfo &pi : *plugins)
 	{
-		PluginOption* opt = new PluginOption(pi.filename.c_str(), L"plugins", CONFIG_FILE, pi.name.c_str(), pi.description.c_str(), true, pi.configopts);
+		PluginOption* opt = new PluginOption(pi.filename.c_str(), L"plugins", CONFIG_FILE, pi.name.c_str(), pi.description.c_str(), true, pi.configopts, pi.builddate);
 		outvec.push_back(opt);
 	}
 

source-code/source/plugins/Launcher/ui.h

@@ -190,6 +190,7 @@ namespace Launcher {
 
 			updateStyle();
 
+			checkHasInvalidGLUT();
 
 			glutInit(&argc, argv);
 			int window = glutCreateWindow("glut"); // a context must be created to use glGetString
@@ -198,8 +199,12 @@ namespace Launcher {
 			String^ vendor = gcnew String((char*)glGetString(GL_VENDOR));
 			vendor = vendor->Replace(" Corporation", ""); // this is useless..  remove it to help ensure the GPU type line fits
 			String^ renderer = gcnew String((char*)glGetString(GL_RENDERER));
+			renderer = renderer->Replace("Apple ", ""); // "Apple Apple M1" -> "Apple M1"
 			String^ version = gcnew String((char*)glGetString(GL_VERSION));
-			version = version->Replace(" Profile Context", ""); // we don't need this, either
+			version = version->Replace(" Profile Context", "") // we don't need this, either
+				// misleading - the Metal layer always provides 2.1 as well as 4.1 Core (with the forwards compatiblity bit)
+				// even though the GLUT context is technically 2.1, inform the user that 4.1 fwcompat is supported (in case they want to use mods)
+				->Replace("2.1 Metal", "2.1/4.1 (forward-compatible) Metal");
 
 			String^ gpuModel = gcnew String(GPUModel::getGpuName().c_str());
 
@@ -232,139 +237,208 @@ namespace Launcher {
 
 			int linkStart = this->labelGPU->Text->Length;
 			bool showGpuDialog = false;
-			if (vendor->Contains("AMD") || vendor->Contains("ATI")) // check OpenGL to get actual GPU being used for vendor check (to get accurate results for iGPU)
+			bool showGpuTypeWarning = false;
+
+			bool hasNovidia = false;
+			bool novidiaEnabled = false;
+
+			bool hasDivaGL = false;
+			bool divaGLEnabled = false;
+
+			for (PluginInfo i : AllPlugins)
 			{
-				bool hasNovidia = false;
-				for (PluginInfo i : AllPlugins)
+				if (i.name == L"Novidia")
 				{
-					if (i.name == L"Novidia")
-						hasNovidia = true;
+					hasNovidia = true;
+					novidiaEnabled = GetIniBool(L"plugins", i.filename.c_str(), 1, CONFIG_FILE);
+				}
+				else if (i.name == L"DivaGL")
+				{
+					hasDivaGL = true;
+					divaGLEnabled = GetIniBool(L"plugins", i.filename.c_str(), 1, CONFIG_FILE);
 				}
 
-				if (hasNovidia)
+				if (hasNovidia && hasDivaGL) break;
+			}
+
+			if (divaGLEnabled)
+			{
+				this->labelGPU->Text += L"Rendering provided by DivaGL.";
+				GPUIssueText = L"Please check DivaGL's requirements to ensure compatibility with your graphics driver.";
+				this->labelGPU->LinkColor = System::Drawing::Color::HotPink;
+			}
+			else
+			{
+				if (vendor->Contains("AMD") || vendor->Contains("ATI")) // check OpenGL to get actual GPU being used for vendor check (to get accurate results for iGPU)
 				{
-					if (wineVersion == "" && (driver_version_major < 21 || (driver_version_major == 21 && driver_version_minor < 6)))
+					if (hasNovidia)
 					{
-						if (driver_version_major == 21 && driver_version_minor == 5)
+						if (novidiaEnabled)
 						{
-							this->labelGPU->Text += L"Driver may have issues.";
-							GPUIssueText = L"The graphics driver you're using should be able to play movies without issues, but may crash while loading a song after playing multiple stages in one session.\nIf possible, please install the latest driver from your GPU vendor's website.\nHowever, note that if your GPU is old, you may not be able to install a more recent driver.";
+							if (wineVersion == "" && (driver_version_major < 21 || (driver_version_major == 21 && driver_version_minor < 6)))
+							{
+								if (driver_version_major == 21 && driver_version_minor == 5)
+								{
+									this->labelGPU->Text += L"Driver may have issues.";
+									GPUIssueText = L"The graphics driver you're using should be able to play movies without issues, but may crash while loading a song after playing multiple stages in one session.\nIf possible, please install the latest driver from your GPU vendor's website.\nHowever, note that if your GPU is old, you may not be able to install a more recent driver.";
+								}
+								else
+								{
+									this->labelGPU->Text += L"Driver has known issues.";
+									GPUIssueText = L"The graphics driver you're using has known issues. Movies may not play back correctly.\nPlease install the latest driver from your GPU vendor's website.";
+									showGpuDialog = true;
+								}
+
+								this->labelGPU->LinkColor = System::Drawing::Color::Orange;
+							}
+							else if (wineVersion == "" && (driver_version_major > 22 || (driver_version_major == 22 && driver_version_minor > 6)))
+							{
+								this->labelGPU->Text += "Issues: Unsupported GPU driver.";
+								GPUIssueText = "The graphics driver you're using is too new for Novidia.\nThe game will not run unless you install driver version 22.6.1 or earlier from AMD's website.\n\nAlternatively, you can try mods such as DivaGL.";
+								this->labelGPU->LinkColor = System::Drawing::Color::Red;
+								showGpuDialog = true;
+							}
+							else
+							{
+								this->labelGPU->Text += "Issues: AMD GPU support is unofficial.";
+								GPUIssueText = "AMD GPUs are not supported without mods.\nThe PD Loader AMDPack seems to be installed, but please keep in mind that it may have issues.";
+								this->labelGPU->LinkColor = System::Drawing::Color::Yellow;
+							}
 						}
 						else
 						{
-							this->labelGPU->Text += L"Driver has known issues.";
-							GPUIssueText = L"The graphics driver you're using has known issues. Movies may not play back correctly.\nPlease install the latest driver from your GPU vendor's website.";
+							this->labelGPU->Text += "Issues: Mods needed for AMD compatibility!";
+							GPUIssueText = "AMD GPUs are not supported without mods.\n" +
+								(hasDivaGL ? "DivaGL/" : "") + "Novidia is installed, but disabled; please enable it to use your AMD GPU.\n\nIf you have a laptop with an NVIDIA GPU and wish to use it instead of the detected GPU, you may need to set diva.exe to use it in Windows settings or NVIDIA Control Panel.";
+							this->labelGPU->LinkColor = System::Drawing::Color::Red;
 							showGpuDialog = true;
 						}
-
-						this->labelGPU->LinkColor = System::Drawing::Color::Orange;
 					}
-					else if (wineVersion == "" && (driver_version_major > 22 || (driver_version_major == 22 && driver_version_minor > 6)))
+					else if (hasDivaGL)
 					{
-						this->labelGPU->Text += "Issues: Unsupported GPU driver.";
-						GPUIssueText = "The graphics driver you're using is too new for Novidia.\nThe game will not run unless you install driver version 22.6.1 or earlier from AMD's website.";
+						this->labelGPU->Text += "Issues: Mods needed for AMD compatibility!";
+						GPUIssueText = "AMD GPUs are not supported without mods.\nDivaGL is installed, but disabled; please enable it to use your AMD GPU.\n\nIf you have a laptop with an NVIDIA GPU and wish to use it instead of the detected GPU, you may need to set diva.exe to use it in Windows settings or NVIDIA Control Panel.";
 						this->labelGPU->LinkColor = System::Drawing::Color::Red;
 						showGpuDialog = true;
 					}
 					else
 					{
-						this->labelGPU->Text += "Issues: AMD GPU support is unofficial.";
-						GPUIssueText = "AMD GPUs are not supported without mods.\nThe PD Loader AMDPack seems to be installed, but please keep in mind that it may have issues.";
-						this->labelGPU->LinkColor = System::Drawing::Color::Yellow;
+						this->labelGPU->Text += "Issues: Mods needed for AMD compatibility!";
+						GPUIssueText = "AMD GPUs are not supported without mods.\nEither DivaGL or Novidia is required. Please download either plugin and check its requirements to ensure compatibility with your graphics driver.\n\nIf you have a laptop with an NVIDIA GPU and wish to use it instead of the detected GPU, you may need to set diva.exe to use it in Windows settings or NVIDIA Control Panel.";
+						this->labelGPU->LinkColor = System::Drawing::Color::Red;
+						showGpuDialog = true;
 					}
 				}
-				else
+				else if (vendor->Contains("NVIDIA"))
 				{
-					this->labelGPU->Text += "Issues: Mods needed for AMD compatibility!";
-					GPUIssueText = "AMD GPUs are not supported without mods.\nThe PD Loader AMDPack can be used to make 3D rendering work. Please download it and follow the included instructions.\n\nIf you have a laptop with an NVIDIA GPU and wish to use it instead of the detected GPU, you may need to set diva.exe to use it in Windows settings or NVIDIA Control Panel.";
-					this->labelGPU->LinkColor = System::Drawing::Color::Red;
-					showGpuDialog = true;
-				}
-			}
-			else if (vendor->Contains("NVIDIA"))
-			{
-				if (wineVersion == "" && (driver_version_major < 391 || (driver_version_major > 446 && driver_version_major < 460)))
-				{
-					this->labelGPU->Text += L"Driver has known issues.";
-					GPUIssueText = L"The graphics driver you're using has known issues. Please install the latest driver from your GPU vendor's website.";
-					this->labelGPU->LinkColor = System::Drawing::Color::Orange;
-					showGpuDialog = true;
-				}
-				else if (gpuModel->StartsWith("GA")) // unconfirmed??
-				{
-					this->labelGPU->Text += L"Issues: Ampere GPU detected! Possible noise.\n(Click for more information)";
-					GPUIssueText = L"On Ampere GPUs (RTX 30xx), some important character shaders have issues resulting in lines/noise.\nPlease make sure the ShaderPatch plugin is enabled.";
-					this->labelGPU->LinkColor = System::Drawing::Color::Yellow;
-				}
-				else if (gpuModel->StartsWith("TU") || gpuModel->StartsWith("GV")) // let's assume Volta is like Turing for now
-				{
-					this->labelGPU->Text += L"Issues: Turing GPU detected! Possible noise.\n(Click for more information)";
-					GPUIssueText = L"On Turing GPUs (GTX 16xx/RTX 20xx), some important character shaders have issues resulting in lines/noise.\nPlease make sure the ShaderPatch plugin is enabled.";
-					this->labelGPU->LinkColor = System::Drawing::Color::Yellow;
-				}
-				else if (gpuModel->StartsWith("GM") || gpuModel->StartsWith("GP"))
-				{
-					this->labelGPU->Text += L"Issues: May have minor noise on some stages.\n(Click for more information)";
-					GPUIssueText = L"On Maxwell GPUs (~GTX 900) and newer, some minor stage shaders create noise.\nPlease make sure the ShaderPatch plugin is enabled.";
-					this->labelGPU->LinkColor = System::Drawing::Color::Teal;
-				}
-				else if (gpuModel->StartsWith("GK"))
-				{
-					this->labelGPU->Text += L"Issues: None.";
-					GPUIssueText = L"Your GPU should have no issues running the game.";
-					this->labelGPU->LinkColor = System::Drawing::Color::LightBlue;
-				}
-				else if (gpuModel->StartsWith("GF"))
-				{
-					if (version[0] < '4')
+					if (wineVersion == "" && (driver_version_major < 391 || (driver_version_major > 446 && driver_version_major < 460)))
 					{
-						this->labelGPU->Text += L"Issues: Driver too old.";
-						GPUIssueText = L"Your GPU should be able to run the game, but it looks like your OpenGL version is too old.\nA driver update should fix this.";
+						this->labelGPU->Text += L"Driver has known issues.";
+						GPUIssueText = L"The graphics driver you're using has known issues. Please install the latest driver from your GPU vendor's website.";
 						this->labelGPU->LinkColor = System::Drawing::Color::Orange;
 						showGpuDialog = true;
 					}
-					else
+					else if (gpuModel->StartsWith("AD")) // unconfirmed??
 					{
-						this->labelGPU->Text += L"Issues: No known issues.";
-						GPUIssueText = L"Your GPU should have no issues running the game, but it is older than the GPU the game was originally designed for (GTX 650 Ti).\nThere may be some issues with graphics.\nPlease report any issues so that they can be analysed and potentially fixed.";
+						this->labelGPU->Text += L"Issues: Ada Lovelace GPU detected! Possible noise.\n(Click for more information)";
+						GPUIssueText = L"On Ada Lovelace GPUs (RTX 40xx), some important character shaders have issues resulting in lines/noise.\nPlease make sure the ShaderPatch plugin is enabled.";
+						this->labelGPU->LinkColor = System::Drawing::Color::Yellow;
+					}
+					else if (gpuModel->StartsWith("GA")) // unconfirmed??
+					{
+						this->labelGPU->Text += L"Issues: Ampere GPU detected! Possible noise.\n(Click for more information)";
+						GPUIssueText = L"On Ampere GPUs (RTX 30xx), some important character shaders have issues resulting in lines/noise.\nPlease make sure the ShaderPatch plugin is enabled.";
+						this->labelGPU->LinkColor = System::Drawing::Color::Yellow;
+					}
+					else if (gpuModel->StartsWith("TU") || gpuModel->StartsWith("GV")) // let's assume Volta is like Turing for now
+					{
+						this->labelGPU->Text += L"Issues: Turing GPU detected! Possible noise.\n(Click for more information)";
+						GPUIssueText = L"On Turing GPUs (GTX 16xx/RTX 20xx), some important character shaders have issues resulting in lines/noise.\nPlease make sure the ShaderPatch plugin is enabled.";
+						this->labelGPU->LinkColor = System::Drawing::Color::Yellow;
+					}
+					else if (gpuModel->StartsWith("GM") || gpuModel->StartsWith("GP"))
+					{
+						this->labelGPU->Text += L"Issues: May have minor noise on some stages.\n(Click for more information)";
+						GPUIssueText = L"On Maxwell GPUs (~GTX 900) and newer, some minor stage shaders create noise.\nPlease make sure the ShaderPatch plugin is enabled.";
 						this->labelGPU->LinkColor = System::Drawing::Color::Teal;
 					}
+					else if (gpuModel->StartsWith("GK"))
+					{
+						this->labelGPU->Text += L"Issues: None.";
+						GPUIssueText = L"Your GPU should have no issues running the game.";
+						this->labelGPU->LinkColor = System::Drawing::Color::LightBlue;
+					}
+					else if (gpuModel->StartsWith("GF"))
+					{
+						if (version[0] < '4')
+						{
+							this->labelGPU->Text += L"Issues: Driver too old.";
+							GPUIssueText = L"Your GPU should be able to run the game, but it looks like your OpenGL version is too old.\nA driver update should fix this.";
+							this->labelGPU->LinkColor = System::Drawing::Color::Orange;
+							showGpuDialog = true;
+						}
+						else
+						{
+							this->labelGPU->Text += L"Issues: No known issues.";
+							GPUIssueText = L"Your GPU should have no issues running the game, but it is older than the GPU the game was originally designed for (GTX 650 Ti).\nThere may be some issues with graphics.\nPlease report any issues so that they can be analysed and potentially fixed.";
+							this->labelGPU->LinkColor = System::Drawing::Color::Teal;
+						}
+					}
+					else if (gpuModel->StartsWith("G") || gpuModel->StartsWith("NV") || gpuModel->StartsWith("NB") || gpuModel->StartsWith("N10") || gpuModel->StartsWith("MCP"))
+					{
+						this->labelGPU->Text += L"Issues: GPU too old! 3D rendering might be broken.\n(Click for more information)";
+						GPUIssueText = L"Your GPU is very old and does not support rendering techniques used by the game.\nYou may be able to play, but graphics will likely have major issues.\nPlease upgrade to a GTX 600 series or later GPU.";
+						this->labelGPU->LinkColor = System::Drawing::Color::Orange;
+						showGpuDialog = true;
+					}
+					else if (version[0] >= '4' && gpuModel->Length > 0 && !gpuModel->StartsWith("Unk") && !gpuModel->StartsWith("Oth"))
+					{
+						this->labelGPU->Text += L"Issues: GPU may be too new.\n(Click for more information)";
+						GPUIssueText = L"It looks like your GPU may be too new. Only up to Ada Lovelace (RTX 40xx) is currently supported.\nYou will likely see lines/noise on important character shaders and some minor stage shaders.\nPlease report any issues so that ShaderPatch can be updated.\n\nTo try to get rid of any artifacts, try selecting a specific GPU architecture in Graphics -> Nvidia GPU (e.g. \"Ada or newer\"), or use DivaGL.";
+						this->labelGPU->LinkColor = System::Drawing::Color::Orange;
+						showGpuDialog = true;
+						showGpuTypeWarning = true;
+					}
+					else
+					{
+						this->labelGPU->Text += L"Issues: Unable to detect GPU architecture.\n(Click for more information)";
+						GPUIssueText = L"It looks like you have an NVIDIA GPU, but something went wrong while trying to determine your GPU's architecture (type).\nThis may be a caused by a bug, but it probably indicates potential issues.\nPlease make sure you have a GTX 600 series or later GPU. (GTX 400 series or later should also work)\n\nIf the game runs but has artifacts, try selecting a specific GPU architecture in Graphics -> Nvidia GPU (e.g. \"Ada or newer\"), or use DivaGL.";
+						this->labelGPU->LinkColor = System::Drawing::Color::Orange;
+						showGpuDialog = true;
+						showGpuTypeWarning = true;
+					}
 				}
-				else if (gpuModel->StartsWith("G") || gpuModel->StartsWith("NV") || gpuModel->StartsWith("NB") || gpuModel->StartsWith("N10") || gpuModel->StartsWith("MCP"))
+				else //if (gpuModel->Length == 0 || gpuModel->StartsWith("Unk") || gpuModel->StartsWith("Oth"))
 				{
-					this->labelGPU->Text += L"Issues: GPU too old! 3D rendering might be broken.\n(Click for more information)";
-					GPUIssueText = L"Your GPU is very old and does not support rendering techniques used by the game.\nYou may be able to play, but graphics will likely have major issues.\nPlease upgrade to a GTX 600 series or later GPU.";
-					this->labelGPU->LinkColor = System::Drawing::Color::Orange;
+					this->labelGPU->Text += L"Issues: UNSUPPORTED GPU!";
+					GPUIssueText = L"Your graphics card is not supported. Only NVIDIA GPUs are recommended (though others can be used with mods).\nPlease use a GTX 600 series or later NVIDIA GPU.\n\nIf you have a laptop with an NVIDIA GPU and wish to use it instead of the detected GPU, you may need to set diva.exe to use it in Windows settings or NVIDIA Control Panel.\n\nOwners of other GPUs may be able to run the game using plugins or mods, such as DivaGL, Novidia, or DivaImGui.";
+					this->labelGPU->LinkColor = System::Drawing::Color::Red;
 					showGpuDialog = true;
 				}
-				else if (version[0] >= '4' && gpuModel->Length > 0 && !gpuModel->StartsWith("Unk") && !gpuModel->StartsWith("Oth"))
-				{
-					this->labelGPU->Text += L"Issues: GPU may be too new.\n(Click for more information)";
-					GPUIssueText = L"It looks like your GPU may be too new. Only up to Ampere (RTX 30xx) is currently supported.\nGood news: the game should be capable of running, but shader patches (probably needed) may not support it yet.\nYou will likely see lines/noise on important character shaders and some minor stage shaders.\nPlease report any issues so that ShaderPatch can be updated.\nYou can also try forcing a specific GPU workaround type.";
-					this->labelGPU->LinkColor = System::Drawing::Color::Orange;
-				}
-				else
-				{
-					this->labelGPU->Text += L"Issues: Unable to detect GPU architecture.\n(Click for more information)";
-					GPUIssueText = L"It looks like you have an NVIDIA GPU, but something went wrong while trying to determine your GPU's architecture (type).\nThis may be a caused by a bug, but it probably indicates potential issues.\nPlease make sure you have a GTX 600 series or later GPU. (GTX 400 series or later should also work)";
-					this->labelGPU->LinkColor = System::Drawing::Color::Orange;
-					showGpuDialog = true;
-				}
-			}
-			else //if (gpuModel->Length == 0 || gpuModel->StartsWith("Unk") || gpuModel->StartsWith("Oth"))
-			{
-				this->labelGPU->Text += L"Issues: UNSUPPORTED GPU!";
-				GPUIssueText = L"Your graphics card is not supported. Only NVIDIA GPUs are recommended (though AMD ones can be used with mods).\nPlease use a GTX 600 series or later NVIDIA GPU.\n\nIf you have a laptop with an NVIDIA GPU and wish to use it instead of the detected GPU, you may need to set diva.exe to use it in Windows settings or NVIDIA Control Panel.\n\nOwners of other GPUs may be able to run the game using plugins or mods, but 3D graphics will probably not work.";
-				this->labelGPU->LinkColor = System::Drawing::Color::Red;
-				showGpuDialog = true;
 			}
 			int linkEnd = this->labelGPU->Text->Length - linkStart;
 
 			this->labelGPU->LinkClicked += gcnew System::Windows::Forms::LinkLabelLinkClickedEventHandler(this, &ui::LinkLabelLinkClickedGPUIssueHandler);
 			this->labelGPU->LinkArea = System::Windows::Forms::LinkArea(linkStart, linkEnd);
 
-			if (showGpuDialog && !nNoGPUDialog)
-				SkinnedMessageBox::Show(this, GPUIssueText + "\n\nYou can disable this message from the options tab.", "PD Launcher", MessageBoxButtons::OK, MessageBoxIcon::Warning);
+			if (!nNoGPUDialog)
+			{
+				if (showGpuDialog)
+					SkinnedMessageBox::Show(this, GPUIssueText + "\n\nYou can disable this message from the Options tab.", "PD Launcher", MessageBoxButtons::OK, MessageBoxIcon::Warning);
+
+				if (showGpuTypeWarning)
+				{
+					Label^ gpuTypeLabel = ((Label^)Control::FromHandle(((DropdownOption*)(graphicsArray[0]))->labelHandle));
+					ComboBox^ gpuTypeCtrl = ((ComboBox^)Control::FromHandle(((DropdownOption*)(graphicsArray[0]))->mainControlHandle));
+					gpuTypeLabel->Text = "/!\\ " + gpuTypeLabel->Text;
+					gpuTypeLabel->BackColor = System::Drawing::Color::Gold;
+					gpuTypeLabel->ForeColor = System::Drawing::Color::Crimson;
+					gpuTypeCtrl->Items[0] = "SELECT ONE";
+					gpuTypeCtrl->BackColor = System::Drawing::Color::Gold;
+					gpuTypeCtrl->ForeColor = System::Drawing::Color::Crimson;
+					gpuTypeCtrl->FlatStyle = System::Windows::Forms::FlatStyle::Flat;
+				}
+			}
 		}
 
 	protected:
@@ -663,7 +737,7 @@ private: System::Windows::Forms::Button^ button_Wiki;
 			this->trackBar_LagCompensation->Size = System::Drawing::Size(500, 90);
 			this->trackBar_LagCompensation->TabIndex = 0;
 			this->trackBar_LagCompensation->TickStyle = System::Windows::Forms::TickStyle::None;
-			this->trackBar_LagCompensation->ValueChanged += gcnew System::EventHandler(this, &ui::trackBar_LagCompensation_ValueChanged);
+			this->trackBar_LagCompensation->Scroll += gcnew System::EventHandler(this, &ui::trackBar_LagCompensation_Scroll);
 			// 
 			// groupBox_Details
 			// 
@@ -1042,10 +1116,104 @@ private: System::Void SaveSettings() {
 private: System::Void Button_Help_Click(System::Object^ sender, System::EventArgs^ e) {
 	System::Diagnostics::Process::Start("https://github.com/PDModdingCommunity/PD-Loader/wiki");
 }
+private: System::Boolean hasInvalidGLUT = false;
+private: System::Void checkHasInvalidGLUT()
+{
+	HMODULE glutHm = GetModuleHandleW(L"glut32.dll");
+	hasInvalidGLUT = glutHm != NULL && GetProcAddress(glutHm, "__glutGetFCB") == NULL;
+
+	if (hasInvalidGLUT)
+	{
+		SkinnedMessageBox::Show(this, "Support for custom versions of \"glut32.dll\" is deprecated and will be removed in future versions of PD Loader.\nPlease restore a valid copy of the original file, then validate your files and make sure \"glut32.dll\" passes.\n\nPlease DO NOT ASK for a copy of the file in our support channels!\nWe cannot provide it to you.", "PD Launcher", MessageBoxButtons::OK, MessageBoxIcon::Warning);
+	}
+}
+private: System::Boolean hasInvalidSettings()
+{
+	bool divaGLEnabled = false;
+	bool novidiaEnabled = false;
+	bool shaderPatchEnabled = false;
+	//bool divaImGuiEnabled = false;
+	bool divaImGuiOldEnabled = false;
+
+	for (PluginOption* option : AllPluginOpts)
+	{
+		if (lstrcmpW(option->_friendlyName, L"DivaGL") == 0)
+		{
+			divaGLEnabled = ((CheckBox^)CheckBox::FromHandle(option->mainControlHandle))->Checked;
+			if (divaGLEnabled)
+			{
+				if (hasInvalidGLUT) goto divagl_freeglut;
+				else if (novidiaEnabled || shaderPatchEnabled) goto divagl_novidia;
+				else if (divaImGuiOldEnabled) goto divagl_divaimguiold;
+			}
+		}
+		else if (lstrcmpW(option->_friendlyName, L"Novidia") == 0)
+		{
+			novidiaEnabled = ((CheckBox^)CheckBox::FromHandle(option->mainControlHandle))->Checked;
+			if (novidiaEnabled && divaGLEnabled) goto divagl_novidia;
+		}
+		else if (lstrcmpW(option->_friendlyName, L"ShaderPatch") == 0)
+		{
+			shaderPatchEnabled = ((CheckBox^)CheckBox::FromHandle(option->mainControlHandle))->Checked;
+			if (shaderPatchEnabled && divaGLEnabled) goto divagl_novidia;
+		}
+		else if (lstrcmpW(option->_friendlyName, L"DivaImGui") == 0)
+		{
+			//divaImGuiEnabled = ((CheckBox^)CheckBox::FromHandle(option->mainControlHandle))->Checked;
+
+			if (option->_builddate == L"Unknown")
+			{
+				divaImGuiOldEnabled = ((CheckBox^)CheckBox::FromHandle(option->mainControlHandle))->Checked;
+				if (divaImGuiOldEnabled && divaGLEnabled) goto divagl_divaimguiold;
+			}
+		}
+	}
+
+	//if (divaImGuiEnabled)
+	//{
+	//	for (ConfigOptionBase* option : graphicsArray)
+	//	{
+	//		if (option->_iniSectionName == GRAPHICS_SECTION && option->_iniVarName == L"2D")
+	//		{
+	//			if (((CheckBox^)CheckBox::FromHandle(option->mainControlHandle))->Checked)
+	//			{
+	//				SkinnedMessageBox::Show(this, "Graphics: \"Disable 3D rendering\" must be disabled if DivaImGui is enabled.", "PD Launcher", MessageBoxButtons::OK, MessageBoxIcon::Error);
+	//				return true;
+	//			}
+	//			break;
+	//		}
+	//	}
+	//}
+
+	return false;
+
+divagl_freeglut:
+	SkinnedMessageBox::Show(this, "Plugins: DivaGL does not support custom versions of \"glut32.dll\".\nPlease restore a valid copy of the original file, then validate your files and make sure \"glut32.dll\" passes.\n\nPlease DO NOT ASK for a copy of the file in our support channels!\nWe cannot provide it to you.", "PD Launcher", MessageBoxButtons::OK, MessageBoxIcon::Error);
+	return true;
+
+divagl_novidia:
+	SkinnedMessageBox::Show(this, "Plugins: Novidia and ShaderPatch must be disabled if DivaGL is enabled.", "PD Launcher", MessageBoxButtons::OK, MessageBoxIcon::Error);
+	return true;
+
+divagl_divaimguiold:
+	SkinnedMessageBox::Show(this, "Plugins: Your version of DivaImGui is too old for DivaGL; please either update or disable it.", "PD Launcher", MessageBoxButtons::OK, MessageBoxIcon::Error);
+	return true;
+}
+private: System::Boolean warnCheck()
+{
+	if (((ComboBox^)Control::FromHandle(((DropdownOption*)(graphicsArray[0]))->mainControlHandle))->Text == "SELECT ONE" &&
+		SkinnedMessageBox::Show(this, L"GPU detection has failed and no Nvidia GPU architecture has been selected.\nAs such, characters and stages may exhibit artifacts, such as noisy shadows and stages.\nIf unsure, try all of the options starting from Kepler.\n\nLaunch anyway?", "PD Launcher", MessageBoxButtons::YesNo, MessageBoxIcon::Error) != System::Windows::Forms::DialogResult::OK)
+			return false;
+
+	return true;
+}
 private: System::Void Button_Launch_Click(System::Object^ sender, System::EventArgs^ e) {
 	
 	//SkinnedMessageBox::Show(this, "It looks like the executable has been tampered with, or the version of the game is not 7.10.\n\nPlease use the \"patches\" folder instead of modifying the executable directly (or disable verification).", "PD Launcher", MessageBoxButtons::OK, MessageBoxIcon::Error);
 
+	if (!warnCheck()) return;
+	if (hasInvalidSettings()) return;
+
 	SaveSettings();
 
 	if (GetPrivateProfileIntW(LAUNCHER_SECTION, L"use_divahook_bat", FALSE, CONFIG_FILE))
@@ -1203,9 +1371,9 @@ private: bool AnyConfigChanged() {
 
 private: String^ GPUIssueText;
 private: System::Void LinkLabelLinkClickedGPUIssueHandler(System::Object^ sender, System::Windows::Forms::LinkLabelLinkClickedEventArgs^ e) {
-	SkinnedMessageBox::Show(this, GPUIssueText, "PD Launcher", MessageBoxButtons::OK, MessageBoxIcon::Warning);
+	SkinnedMessageBox::Show(this, GPUIssueText, "PD Launcher", MessageBoxButtons::OK, MessageBoxIcon::Information);
 }
-private: System::Void trackBar_LagCompensation_ValueChanged(System::Object^ sender, System::EventArgs^ e) {
+private: System::Void trackBar_LagCompensation_Scroll(System::Object^ sender, System::EventArgs^ e) {
 	*LagCompensationConfigChanged = true;
 
 	updateLagCompMsec();
@@ -1215,7 +1383,5 @@ private: System::Void tabPage_Resolution_Click(System::Object^ sender, System::E
 private: System::Void button_Wiki_Click(System::Object^ sender, System::EventArgs^ e) {
 	System::Diagnostics::Process::Start("https://github.com/PDModdingCommunity/PD-Loader/wiki");
 }
-private: System::Void trackBar_LagCompensation_Scroll(System::Object^ sender, System::EventArgs^ e) {
-}
 };
 }

source-code/source/plugins/Novidia/src/framework.h

@@ -1,8 +1,13 @@
 #pragma once
 
-#include "glStuff.h"
+//#define WIN32_LEAN_AND_MEAN
+//#include <windows.h>
+//#include <psapi.h>
+
 #include <vector>
 
+#include "glStuff.h"
+
 // use this as a hook to perform initialisation
 void(__cdecl* glutSetCursor)(int cursor) = *(void(__cdecl**)(int))0x140966068;
 void(__cdecl* uploadModelTransformBuf)(DWORD* a1, int a2) = (void(__cdecl*)(DWORD * a1, int a2))0x140444fa0;
@@ -112,4 +117,38 @@ void InjectCode(void* address, const std::vector<uint8_t> data)
 	VirtualProtect(address, byteCount, PAGE_EXECUTE_READWRITE, &oldProtect);
 	memcpy(address, data.data(), byteCount);
 	VirtualProtect(address, byteCount, oldProtect, nullptr);
-}
+}
+
+//bool hasConflicts()
+//{
+//	printf("[Novidia] Checking for conflicts...\n");
+//
+//	HMODULE* hModules = new HMODULE[USHRT_MAX];
+//	HANDLE hProcess;
+//	DWORD cbNeeded;
+//
+//	hProcess = GetCurrentProcess();
+//
+//	if (EnumProcessModules(hProcess, hModules, sizeof(hModules), &cbNeeded)) {
+//		for (unsigned long long i = 0; i < (cbNeeded / sizeof(HMODULE)); i++) {
+//			auto pNameFunc = (LPCWSTR(*)())GetProcAddress(hModules[i], "GetPluginName");
+//			if (pNameFunc) {
+//				LPCWSTR name = pNameFunc();
+//				if (name && lstrcmpW(name, L"DivaGL") == 0)
+//				{
+//					// detected DivaGL
+//					printf("[Novidia] Detected DivaGL! Quitting!\n");
+//#ifdef _DEBUG
+//					MessageBoxExW(NULL, L"Detected DivaGL! Quitting!\n", L"Novidia", MB_OK, 0);
+//#endif
+//					delete[] hModules;
+//					return true;
+//				}
+//			}
+//		}
+//	}
+//
+//	printf("[Novidia] No conflicts found.\n");
+//	delete[] hModules;
+//	return false;
+//}

source-code/source/plugins/Patches/PatchApplier710.h

@@ -555,7 +555,7 @@ class PatchApplier710 : public PatchApplier {
 		// Reflections
 		if (!nReflections)
 		{
-			InjectCode((void*)0x1406477C0, { 0xE9, 0xF3, 0x00, 0x00, 0x00, 0x90 });
+			InjectCode((void*)0x1406477C6, { 0xE9, 0xE9, 0x00, 0x00, 0x00, 0x90, 0x90, 0x90 });
 			InjectCode((void*)0x1411ADAFC, { 0x00 });
 		}
 		// Shadows

source-code/source/plugins/Render/dllmain.cpp

@@ -135,8 +135,8 @@ __int64 hookedParseParameters(int a1, __int64* a2)
 		case 600:
 			*resolutionType_600 = 15;
 			break;
-		default:
-			*resolutionType_710 = 15;
+		//default:
+		//	*resolutionType_710 = 15;
 		}
 	// Return to the original function
 	switch (game_version)
@@ -144,8 +144,8 @@ __int64 hookedParseParameters(int a1, __int64* a2)
 	case 600:
 		return divaParseParameters_600(a1, a2);
 		break;
-	default:
-		return divaParseParameters_710(a1, a2);
+	//default:
+	//	return divaParseParameters_710(a1, a2);
 	}
 }
 
@@ -231,6 +231,40 @@ __int64 __fastcall limiterFuncLight(__int64 a1)
 	}
 }
 
+#define WRITE_MEMORY_INT(address, data) \
+{ \
+DWORD oldProtect, bck; \
+VirtualProtect((BYTE*)(address), 4, PAGE_EXECUTE_READWRITE, &oldProtect); \
+*((int*)(address)) = (data); \
+VirtualProtect((BYTE*)(address), 4, oldProtect, &bck); \
+}
+
+void __fastcall hookedInitRender(int ssaa, int hd_res, int ss_alpha_mask, __int8 npr) {
+	if (nIntRes)
+	{
+		const __int64 widthAddress = 0x0000000140EDA8B0 + 0x0C;
+		const __int64 heightAddress = 0x0000000140EDA8B0 + 0x10;
+		const __int64 intWidthAddress = 0x0000000140EDA8D8 + 0x0C;
+		const __int64 intHeightAddress = 0x0000000140EDA8D8 + 0x10;
+
+		int originalWidth = *(int*)widthAddress;
+		int originalHeight = *(int*)heightAddress;
+		int originalIntWidth = *(int*)intWidthAddress;
+		int originalIntHeight = *(int*)intHeightAddress;
+		WRITE_MEMORY_INT(widthAddress, nIntResWidth);
+		WRITE_MEMORY_INT(heightAddress, nIntResHeight);
+		WRITE_MEMORY_INT(intWidthAddress, nIntResWidth);
+		WRITE_MEMORY_INT(intHeightAddress, nIntResHeight);
+		divaInitRender_710(ssaa, hd_res, ss_alpha_mask, npr);
+		WRITE_MEMORY_INT(widthAddress, originalWidth);
+		WRITE_MEMORY_INT(heightAddress, originalHeight);
+		WRITE_MEMORY_INT(intWidthAddress, originalIntWidth);
+		WRITE_MEMORY_INT(intHeightAddress, originalIntHeight);
+	}
+	else
+		divaInitRender_710(ssaa, hd_res, ss_alpha_mask, npr);
+}
+
 __int64 __fastcall hookedEngineUpdate(__int64 a1)
 {
 	if (nFpsLimit < 1)
@@ -284,17 +318,17 @@ BOOL APIENTRY DllMain(HMODULE hModule,
 		}
 		DetourTransactionCommit();
 
-		DetourTransactionBegin();
-		DetourUpdateThread(GetCurrentThread());
 		switch (game_version)
 		{
 		case 600:
+			DetourTransactionBegin();
+			DetourUpdateThread(GetCurrentThread());
 			DetourAttach(&(PVOID&)divaParseParameters_600, hookedParseParameters);
+			DetourTransactionCommit();
 			break;
-		default:
-			DetourAttach(&(PVOID&)divaParseParameters_710, hookedParseParameters);
+		//default:
+		//	DetourAttach(&(PVOID&)divaParseParameters_710, hookedParseParameters);
 		}
-		DetourTransactionCommit();
 
 
 		// set sleep time resolution to 2ms or device minimum (whichever's lower)
@@ -340,39 +374,14 @@ BOOL APIENTRY DllMain(HMODULE hModule,
 			switch (game_version)
 			{
 			case 600:
-			{
-				DWORD oldProtect, bck;
-					VirtualProtect((BYTE*)0x0000000140980954, 4, PAGE_EXECUTE_READWRITE, &oldProtect);
-				*((int*)0x0000000140980954) = nIntResWidth;
-				VirtualProtect((BYTE*)0x0000000140980954, 6, oldProtect, &bck);
-			}
-			{
-				DWORD oldProtect, bck;
-				VirtualProtect((BYTE*)0x0000000140980958, 4, PAGE_EXECUTE_READWRITE, &oldProtect);
-				*((int*)0x0000000140980958) = nIntResHeight;
-				VirtualProtect((BYTE*)0x0000000140980958, 6, oldProtect, &bck);
-			}
-			break;
+				WRITE_MEMORY_INT(0x0000000140980954, nIntResWidth);
+				WRITE_MEMORY_INT(0x0000000140980958, nIntResWidth);
+				break;
 			default:
-				{
-					DWORD oldProtect, bck;
-					VirtualProtect((BYTE*)0x00000001409B8B68, 4, PAGE_EXECUTE_READWRITE, &oldProtect);
-					*((int*)0x00000001409B8B68) = nIntResWidth;
-					VirtualProtect((BYTE*)0x00000001409B8B68, 6, oldProtect, &bck);
-				}
-				{
-					DWORD oldProtect, bck;
-					VirtualProtect((BYTE*)0x00000001409B8B6C, 4, PAGE_EXECUTE_READWRITE, &oldProtect);
-					*((int*)0x00000001409B8B6C) = nIntResHeight;
-					VirtualProtect((BYTE*)0x00000001409B8B6C, 6, oldProtect, &bck);
-				}
-
-				//*((int*)0x00000001409B8B6C) = maxHeight;
-				//*((int*)0x00000001409B8B14) = maxWidth;
-				//*((int*)0x00000001409B8B18) = maxHeight;
-
-				//*((int*)0x00000001409B8B1C) = maxWidth; // No parameters width?
-				//*((int*)0x00000001409B8B20) = maxHeight; // No parameters height?
+				DetourTransactionBegin();
+				DetourUpdateThread(GetCurrentThread());
+				DetourAttach(&(PVOID&)divaInitRender_710, hookedInitRender);
+				DetourTransactionCommit();
 			}
 		}
 	}
@@ -390,4 +399,4 @@ extern "C" __declspec(dllexport) LPCWSTR GetPluginName(void)
 extern "C" __declspec(dllexport) LPCWSTR GetPluginDescription(void)
 {
 	return L"Applies window mode/size and FPS limiting.";
-}
+}

source-code/source/plugins/Render/framework.h

@@ -6,11 +6,12 @@
 #include <string>
 
 static int(__cdecl* divaCreateWindow_710)(const char* title, void(__cdecl* exitfunc)(int)) = (int(__cdecl*)(const char* title, void(__cdecl * exitfunc)(int)))0x140194D00;
-__int64 (__fastcall* divaParseParameters_710)(int a1, __int64* a2) = (__int64(__fastcall*)(int a1, __int64* a2))0x140193630;
+void(__fastcall* divaInitRender_710)(int ssaa, int hd_res, int ss_alpha_mask, __int8 npr) = (void(__fastcall *)(int ssaa, int hd_res, int ss_alpha_mask, __int8 npr))0x0000000140502A10;
+//__int64 (__fastcall* divaParseParameters_710)(int a1, __int64* a2) = (__int64(__fastcall*)(int a1, __int64* a2))0x140193630;
 __int64(__fastcall* divaEngineUpdate_710)(__int64 a1) = (__int64(__fastcall*)(__int64 a1))0x140194CD0;
 
 uint8_t* fullScreenFlag_710 = (uint8_t*)0x140EDA5D1;
-DWORD* resolutionType_710 = (DWORD*)0x140EDA5D4;
+//DWORD* resolutionType_710 = (DWORD*)0x140EDA5D4;
 
 
 static int(__cdecl* divaCreateWindow_600)(const char* title, void(__cdecl* exitfunc)(int)) = (int(__cdecl*)(const char* title, void(__cdecl * exitfunc)(int)))0x14018CD00;

source-code/source/plugins/ShaderPatch/src/framework.h

@@ -1,6 +1,7 @@
 #pragma once
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-#include <windows.h>
+//#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
+//#include <windows.h>
+//#include <psapi.h>
 #include <string>
 #include <vector>
 #include <map>
@@ -127,3 +128,36 @@ LPCWSTR DATA_FILE = DATA_FILE_STRING.c_str();
 std::wstring CONFIG_FILE_STRING = DirPath() + L"\\plugins\\ShaderPatchConfig.ini";
 LPCWSTR CONFIG_FILE = CONFIG_FILE_STRING.c_str();
 
+//bool hasConflicts()
+//{
+//	printf("[ShaderPatch] Checking for conflicts...\n");
+//
+//	HMODULE* hModules = new HMODULE[USHRT_MAX];
+//	HANDLE hProcess;
+//	DWORD cbNeeded;
+//
+//	hProcess = GetCurrentProcess();
+//
+//	if (EnumProcessModules(hProcess, hModules, sizeof(hModules), &cbNeeded)) {
+//		for (unsigned long long i = 0; i < (cbNeeded / sizeof(HMODULE)); i++) {
+//			auto pNameFunc = (LPCWSTR(*)())GetProcAddress(hModules[i], "GetPluginName");
+//			if (pNameFunc) {
+//				LPCWSTR name = pNameFunc();
+//				if (name && lstrcmpW(name, L"DivaGL") == 0)
+//				{
+//					// detected DivaGL
+//					printf("[ShaderPatch] Detected DivaGL! Quitting!\n");
+//#ifdef _DEBUG
+//					MessageBoxExW(NULL, L"Detected DivaGL! Quitting!\n", L"ShaderPatch", MB_OK, 0);
+//#endif
+//					delete[] hModules;
+//					return true;
+//				}
+//			}
+//		}
+//	}
+//
+//	printf("[ShaderPatch] No conflicts found.\n");
+//	delete[] hModules;
+//	return false;
+//}

source-code/source/plugins/TLAC/Components/Pause.cpp

@@ -32,9 +32,13 @@ namespace TLAC::Components
 	Pause::menusets Pause::curMenuSet = MENUSET_MAIN;
 	std::chrono::time_point<std::chrono::high_resolution_clock> Pause::menuItemMoveTime;
 	std::vector<uint8_t> Pause::origAetMovOp;
+	float_t Pause::origDeltaFrameHistory = 0.0f;
+	int32_t Pause::origDeltaFrameHistoryInt = 0;
 	uint8_t* Pause::aetMovPatchAddress = (uint8_t*)0x1401703b3;
 	std::vector<uint8_t> Pause::origFramespeedOp;
 	uint8_t* Pause::framespeedPatchAddress = (uint8_t*)0x140192D50;
+	float_t* Pause::deltaFrameHistoryAddress = (float_t*)0x140EDA6C0;
+	int32_t* Pause::deltaFrameHistoryIntAddress = (int32_t*)0x140EDA6C4;
 	std::vector<uint8_t> Pause::origAgeageHairOp;
 	uint8_t* Pause::ageageHairPatchAddress = (uint8_t*)0x14054352c;
 	std::vector<bool> Pause::streamPlayStates;
@@ -136,6 +140,12 @@ namespace TLAC::Components
 				InjectCode(framespeedPatchAddress, { 0x0f, 0x57, 0xc0, 0xc3 }); // XORPS XMM0,XMM0; RET
 				InjectCode(ageageHairPatchAddress, { 0x0f, 0x57, 0xdb }); // XORPS XMM3,XMM3
 
+				origDeltaFrameHistory = *deltaFrameHistoryAddress;
+				origDeltaFrameHistoryInt = *deltaFrameHistoryIntAddress;
+
+				*deltaFrameHistoryAddress = 0.0f;
+				*deltaFrameHistoryIntAddress = 0;
+
 				uint64_t audioMixerAddr = *(uint64_t*)(AUDIO_MAIN_CLASS_ADDRESS + 0x70);
 				uint64_t audioStreamsAddress = *(uint64_t*)(audioMixerAddr + 0x18);
 				int nAudioStreams = *(uint64_t*)(audioMixerAddr + 0x20);
@@ -279,6 +289,9 @@ namespace TLAC::Components
 				InjectCode(framespeedPatchAddress, origFramespeedOp);
 				InjectCode(ageageHairPatchAddress, origAgeageHairOp);
 
+				*deltaFrameHistoryAddress = origDeltaFrameHistory;
+				*deltaFrameHistoryIntAddress = origDeltaFrameHistoryInt;
+
 				uint64_t audioMixerAddr = *(uint64_t*)(AUDIO_MAIN_CLASS_ADDRESS + 0x70);
 				uint64_t audioStreamsAddress = *(uint64_t*)(audioMixerAddr + 0x18);
 				int nAudioStreams = *(uint64_t*)(audioMixerAddr + 0x20);

source-code/source/plugins/TLAC/Components/Pause.h

@@ -47,6 +47,10 @@ namespace TLAC::Components
 
 		static std::vector<uint8_t> origFramespeedOp;
 		static uint8_t* framespeedPatchAddress;
+		static float_t origDeltaFrameHistory;
+		static int32_t origDeltaFrameHistoryInt;
+		static float_t* deltaFrameHistoryAddress;
+		static int32_t* deltaFrameHistoryIntAddress;
 
 		static std::vector<uint8_t> origAgeageHairOp;
 		static uint8_t* ageageHairPatchAddress;

source-code/source/plugins/TLAC/Constants.h

@@ -8,7 +8,7 @@ constexpr uint8_t JNE_OPCODE = 0x85;
 
 //constexpr uint64_t ENGINE_UPDATE_HOOK_TARGET_ADDRESS	= 0x000000014018CC40;
 constexpr uint64_t ENGINE_UPDATE_INPUT_ADDRESS			= 0x000000014018CBB0;
-constexpr uint64_t ENGINE_DRAW_2D_ADDRESS				= 0x0000000140501F70;
+constexpr uint64_t ENGINE_STAGE_DISP_SHADOW_ADDRESS		= 0x0000000140649840;
 constexpr uint64_t ENGINE_FINISH_DRAW_ADDRESS			= 0x0000000140192730;
 
 constexpr uint64_t CURRENT_GAME_STATE_ADDRESS			= 0x0000000140EDA810;

source-code/source/plugins/TLAC/dllmain.cpp

@@ -22,7 +22,7 @@
 #pragma comment(lib, "detours.lib")
 
 void(__cdecl* divaEngineUpdate)() = (void(__cdecl*)())0x14018CC40;
-void(__cdecl* divaEngineDraw2D)(void* addr) = (void(__cdecl*)(void* addr))ENGINE_DRAW_2D_ADDRESS;
+void(__cdecl* divaEngineStageDispShadow)() = (void(__cdecl*)())ENGINE_STAGE_DISP_SHADOW_ADDRESS;
 
 LRESULT CALLBACK MessageWindowProcessCallback(HWND, UINT, WPARAM, LPARAM);
 DWORD WINAPI WindowMessageDispatcher(LPVOID);
@@ -396,10 +396,10 @@ void hookedEngineUpdate()
 	//divaEngineUpdate();
 }
 
-void hookedEngineDraw2D(void* addr)
+void hookedEngineStageDispShadow()
 {
+	divaEngineStageDispShadow();
 	TLAC::UpdateDraw2D();
-	divaEngineDraw2D(addr);
 }
 
 BOOL APIENTRY DllMain(HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved)
@@ -425,7 +425,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReser
 
 		DetourTransactionBegin();
 		DetourUpdateThread(GetCurrentThread());
-		DetourAttach(&(PVOID&)divaEngineDraw2D, hookedEngineDraw2D);
+		DetourAttach(&(PVOID&)divaEngineStageDispShadow, hookedEngineStageDispShadow);
 		DetourTransactionCommit();
 
 		//TLAC::InitializeExtraSettings();