Fix allow-force-llvmpipe build
qglxconvenience.cpp is built with strict implicit cast flags. Also treat an empty LIBGL_ALWAYS_SOFTWARE as set because Mesa does that, too. (For QT_XCB_FORCE_SOFTWARE_OPENGL, we follow Qt rules, i.e. empty=unset.)
This commit is contained in:
parent
cdc6229b7e
commit
e6aa6cc6c7
@ -1,6 +1,6 @@
|
|||||||
diff -ur qtbase-opensource-src-5.2.0/src/platformsupport/glxconvenience/qglxconvenience.cpp qtbase-opensource-src-5.2.0-allow-forcing-llvmpipe/src/platformsupport/glxconvenience/qglxconvenience.cpp
|
diff -ur qtbase-opensource-src-5.2.0/src/platformsupport/glxconvenience/qglxconvenience.cpp qtbase-opensource-src-5.2.0-allow-forcing-llvmpipe/src/platformsupport/glxconvenience/qglxconvenience.cpp
|
||||||
--- qtbase-opensource-src-5.2.0/src/platformsupport/glxconvenience/qglxconvenience.cpp 2013-12-08 18:09:47.000000000 +0100
|
--- qtbase-opensource-src-5.2.0/src/platformsupport/glxconvenience/qglxconvenience.cpp 2013-12-08 18:09:47.000000000 +0100
|
||||||
+++ qtbase-opensource-src-5.2.0-allow-forcing-llvmpipe/src/platformsupport/glxconvenience/qglxconvenience.cpp 2014-01-29 16:41:53.000000000 +0100
|
+++ qtbase-opensource-src-5.2.0-allow-forcing-llvmpipe/src/platformsupport/glxconvenience/qglxconvenience.cpp 2014-01-29 17:41:57.000000000 +0100
|
||||||
@@ -116,6 +116,27 @@
|
@@ -116,6 +116,27 @@
|
||||||
|
|
||||||
GLXFBConfig qglx_findConfig(Display *display, int screen , const QSurfaceFormat &format, int drawableBit)
|
GLXFBConfig qglx_findConfig(Display *display, int screen , const QSurfaceFormat &format, int drawableBit)
|
||||||
@ -17,14 +17,14 @@ diff -ur qtbase-opensource-src-5.2.0/src/platformsupport/glxconvenience/qglxconv
|
|||||||
+ // get inherited by other processes, of course only if it wasn't
|
+ // get inherited by other processes, of course only if it wasn't
|
||||||
+ // already set before.
|
+ // already set before.
|
||||||
+ if (!qEnvironmentVariableIsEmpty("QT_XCB_FORCE_SOFTWARE_OPENGL")
|
+ if (!qEnvironmentVariableIsEmpty("QT_XCB_FORCE_SOFTWARE_OPENGL")
|
||||||
+ && qEnvironmentVariableIsEmpty("LIBGL_ALWAYS_SOFTWARE"))
|
+ && !qEnvironmentVariableIsSet("LIBGL_ALWAYS_SOFTWARE"))
|
||||||
+ forceSoftwareOpenGL = true;
|
+ forceSoftwareOpenGL = true;
|
||||||
+
|
+
|
||||||
+ checkedForceSoftwareOpenGL = true;
|
+ checkedForceSoftwareOpenGL = true;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ if (forceSoftwareOpenGL)
|
+ if (forceSoftwareOpenGL)
|
||||||
+ qputenv("LIBGL_ALWAYS_SOFTWARE", "1");
|
+ qputenv("LIBGL_ALWAYS_SOFTWARE", QByteArrayLiteral("1"));
|
||||||
+
|
+
|
||||||
bool reduced = true;
|
bool reduced = true;
|
||||||
GLXFBConfig chosenConfig = 0;
|
GLXFBConfig chosenConfig = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user