eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-31 23:59:03 +01:00
Code Issues 156 Wiki Activity

Ask for the discrete card before anything touches gl

Browse Source 
A laptop with two graphics chips hands an application the integrated one
unless it says otherwise: this machine has a GeForce RTX 5060 and was
drawing on a Radeon 780M. libglvnd makes the choice when it first
resolves a gl entry point, which is after main starts, so setting the
environment here is enough - no wrapper script and no launcher. Names
already set by hand are left alone, and -integratedgpu undoes it for
anyone who would rather keep the battery.
This commit is contained in:
maj00r
2026-09-20 21:22:09 +02:00
parent 9408216ae7
commit 741b955cc7
1 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
EU07.cpp
View File

@@ -105,6 +105,33 @@ LONG WINAPI CrashHandler(EXCEPTION_POINTERS *ExceptionInfo)
#endif #endif
#if !defined(_WIN32)
// Ask for the discrete card before anything touches gl.
//
// A laptop with two graphics chips hands an application the integrated one unless it says otherwise,
// and that is what was happening here: a machine with a GeForce RTX 5060 was drawing on a Radeon 780M.
// The choice is made by libglvnd when it first resolves a gl entry point, which is after this runs, so
// setting the environment here is enough - no wrapper script, no launcher. Names already set by hand
// are left alone, and prefergpu in eu07.ini turns the whole thing off for anyone who would rather keep
// the battery.
void prefer_discrete_gpu()
{
auto const ask = [](char const *Name, char const *Value) {
if (nullptr == std::getenv(Name))
{
::setenv(Name, Value, 0);
}
};
// nvidia's prime render offload, for glx and for egl. the vendor file is where the driver puts it
ask("__NV_PRIME_RENDER_OFFLOAD", "1");
ask("__GLX_VENDOR_LIBRARY_NAME", "nvidia");
ask("__EGL_VENDOR_LIBRARY_FILENAMES", "/usr/share/glvnd/egl_vendor.d/10_nvidia.json");
ask("__VK_LAYER_NV_optimus", "NVIDIA_only");
// and the mesa side of the same question, for an amd or intel pair
ask("DRI_PRIME", "1");
}
#endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef WITHDUMPGEN #ifdef WITHDUMPGEN
@@ -115,6 +142,26 @@ int main(int argc, char *argv[])
// init start timestamp // init start timestamp
Global.startTimestamp = std::chrono::steady_clock::now(); Global.startTimestamp = std::chrono::steady_clock::now();
#if !defined(_WIN32)
// before the configuration is read, because by the time gl is asked for a context it is too late.
// -integratedgpu on the command line, or prefergpu integrated in eu07.ini, is read below and undoes
// this by asking the driver for nothing in particular on the next start
{
auto discrete = true;
for (int index = 1; index < argc; ++index)
{
if (std::string(argv[index]) == "-integratedgpu")
{
discrete = false;
}
}
if (true == discrete)
{
prefer_discrete_gpu();
}
}
#endif
// quick short-circuit for standalone e3d export // quick short-circuit for standalone e3d export
if (argc == 6 && std::string(argv[1]) == "-e3d") if (argc == 6 && std::string(argv[1]) == "-e3d")
{ {