Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:01:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change --ignore-gpu-blacklist to --ignore-gpu-blocklist

Browse source 
The old option name was deprecated by Chrome. Fixes:

[525529:525529:0622/194252.987422:ERROR:service_utils.cc(157)] --ignore-gpu-blacklist is deprecated and will be removed in 2020Q4, use --ignore-gpu-blocklist instead.
This commit is contained in:
Dale Glass 2022-06-22 20:00:34 +02:00
parent cf9e93b611
commit 2720f4348a
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/src/main.cpp
View file

@ -45,7 +45,7 @@ int main(int argc, const char* argv[]) {
auto format = getDefaultOpenGLSurfaceFormat(); auto format = getDefaultOpenGLSurfaceFormat();
// Deal with some weirdness in the chromium context sharing on Mac. // Deal with some weirdness in the chromium context sharing on Mac.
// The primary share context needs to be 3.2, so that the Chromium will // The primary share context needs to be 3.2, so that the Chromium will
// succeed in it's creation of it's command stub contexts. // succeed in it's creation of it's command stub contexts.
format.setVersion(3, 2); format.setVersion(3, 2);
// This appears to resolve the issues with corrupted fonts on OSX. No // This appears to resolve the issues with corrupted fonts on OSX. No
// idea why. // idea why.
@ -54,8 +54,8 @@ int main(int argc, const char* argv[]) {
QSurfaceFormat::setDefaultFormat(format); QSurfaceFormat::setDefaultFormat(format);
#endif #endif
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
// Check the minimum version of // Check the minimum version of
if (gl::getAvailableVersion() < gl::getRequiredVersion()) { if (gl::getAvailableVersion() < gl::getRequiredVersion()) {
MessageBoxA(nullptr, "Interface requires OpenGL 4.1 or higher", "Unsupported", MB_OK); MessageBoxA(nullptr, "Interface requires OpenGL 4.1 or higher", "Unsupported", MB_OK);
return -1; return -1;
@ -356,7 +356,7 @@ int main(int argc, const char* argv[]) {
} }
} }
// Early check for --traceFile argument // Early check for --traceFile argument
auto tracer = DependencyManager::set<tracing::Tracer>(); auto tracer = DependencyManager::set<tracing::Tracer>();
const char * traceFile = nullptr; const char * traceFile = nullptr;
float traceDuration = 0.0f; float traceDuration = 0.0f;
@ -370,7 +370,7 @@ int main(int argc, const char* argv[]) {
return 1; return 1;
} }
} }
PROFILE_SYNC_BEGIN(startup, "main startup", ""); PROFILE_SYNC_BEGIN(startup, "main startup", "");
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
@ -378,8 +378,8 @@ int main(int argc, const char* argv[]) {
#endif #endif
#if defined(USE_GLES) && defined(Q_OS_WIN) #if defined(USE_GLES) && defined(Q_OS_WIN)
// When using GLES on Windows, we can't create normal GL context in Qt, so // When using GLES on Windows, we can't create normal GL context in Qt, so
// we force Qt to use angle. This will cause the QML to be unable to be used // we force Qt to use angle. This will cause the QML to be unable to be used
// in the output window, so QML should be disabled. // in the output window, so QML should be disabled.
qputenv("QT_ANGLE_PLATFORM", "d3d11"); qputenv("QT_ANGLE_PLATFORM", "d3d11");
QCoreApplication::setAttribute(Qt::AA_UseOpenGLES); QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
@ -550,7 +550,7 @@ int main(int argc, const char* argv[]) {
// Extend argv to enable WebGL rendering // Extend argv to enable WebGL rendering
std::vector<const char*> argvExtended(&argv[0], &argv[argc]); std::vector<const char*> argvExtended(&argv[0], &argv[argc]);
argvExtended.push_back("--ignore-gpu-blacklist"); argvExtended.push_back("--ignore-gpu-blocklist");
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
argvExtended.push_back("--suppress-settings-reset"); argvExtended.push_back("--suppress-settings-reset");
#endif #endif