summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-10-31 01:39:37 +0100
committerPetr Mrázek <peterix@gmail.com>2013-10-31 01:39:37 +0100
commitf39a83edc6b1de3f99eaf2c1cfc409f50a1df1b2 (patch)
tree757bca522a72787b8592e1e29cc16ad962b32c96 /logic
parent44823324f9f489adf957a459bac5dd4d0693e85e (diff)
downloadMultiMC-f39a83edc6b1de3f99eaf2c1cfc409f50a1df1b2.tar
MultiMC-f39a83edc6b1de3f99eaf2c1cfc409f50a1df1b2.tar.gz
MultiMC-f39a83edc6b1de3f99eaf2c1cfc409f50a1df1b2.tar.lz
MultiMC-f39a83edc6b1de3f99eaf2c1cfc409f50a1df1b2.tar.xz
MultiMC-f39a83edc6b1de3f99eaf2c1cfc409f50a1df1b2.zip
Hack for Intel graphics drivers on Windows.
Diffstat (limited to 'logic')
-rw-r--r--logic/LegacyInstance.cpp9
-rw-r--r--logic/OneSixInstance.cpp13
2 files changed, 20 insertions, 2 deletions
diff --git a/logic/LegacyInstance.cpp b/logic/LegacyInstance.cpp
index f741caad..2fd18693 100644
--- a/logic/LegacyInstance.cpp
+++ b/logic/LegacyInstance.cpp
@@ -74,6 +74,15 @@ MinecraftProcess *LegacyInstance::prepareForLaunch(LoginResponse response)
args << QString("-Xms%1m").arg(settings().get("MinMemAlloc").toInt());
args << QString("-Xmx%1m").arg(settings().get("MaxMemAlloc").toInt());
args << QString("-XX:PermSize=%1m").arg(settings().get("PermGen").toInt());
+/**
+* HACK: Stupid hack for Intel drivers.
+* See: https://mojang.atlassian.net/browse/MCL-767
+*/
+#ifdef Q_OS_WIN32
+ args << QString("-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_"
+ "minecraft.exe.heapdump");
+#endif
+
args << "-jar" << LAUNCHER_FILE;
args << response.player_name;
args << response.session_id;
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp
index d80f6b37..7539d8e5 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -119,6 +119,16 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(LoginResponse response)
args << QString("-Xms%1m").arg(settings().get("MinMemAlloc").toInt());
args << QString("-Xmx%1m").arg(settings().get("MaxMemAlloc").toInt());
args << QString("-XX:PermSize=%1m").arg(settings().get("PermGen").toInt());
+
+/**
+ * HACK: Stupid hack for Intel drivers.
+ * See: https://mojang.atlassian.net/browse/MCL-767
+ */
+#ifdef Q_OS_WIN32
+ args << QString("-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_"
+ "minecraft.exe.heapdump");
+#endif
+
QDir natives_dir(natives_dir_raw);
args << QString("-Djava.library.path=%1").arg(natives_dir.absolutePath());
QString classPath;
@@ -148,7 +158,7 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(LoginResponse response)
// Set the width and height for 1.6 instances
bool maximize = settings().get("LaunchMaximized").toBool();
- if(maximize)
+ if (maximize)
{
// this is probably a BAD idea
// args << QString("--fullscreen");
@@ -342,4 +352,3 @@ QString OneSixInstance::instanceConfigFolder() const
{
return PathCombine(minecraftRoot(), "config");
}
-