vcl/opengl/x11/X11DeviceInfo.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
New commits: commit e7f09e0dc320de9959f82736055506d75cf37b52 Author: Markus Mohrhard <[email protected]> Date: Sun Nov 23 01:39:02 2014 +0100 block my OpenGL driver Kendy and I both ahve the same issue related to the driver returning the wrong attribute location in some shaders Change-Id: I496c0f545f7c28c71a94ca8a9ff9fb0b0df46005 diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx index 5f3cc13..cc328b0 100644 --- a/vcl/opengl/x11/X11DeviceInfo.cxx +++ b/vcl/opengl/x11/X11DeviceInfo.cxx @@ -279,6 +279,11 @@ bool X11OpenGLDeviceInfo::isDeviceBlocked() SAL_WARN("vcl.opengl", "blocked driver version: requires at least mesa 7.10.3"); return true; } + else if (mbIsIntel && version(mnMajorVersion, mnMinorVersion, mnRevisionVersion) == version(9,0,2)) + { + SAL_WARN("vcl.opengl", "blocked driver version: my broken intel driver Mesa 9.0.2"); + return true; + } else if (mbIsOldSwrast) { SAL_WARN("vcl.opengl", "blocked driver version: software rasterizer"); return true; commit 743f34d9d20c67deecf6d18a5c8e58e83ab35c98 Author: Markus Mohrhard <[email protected]> Date: Sun Nov 23 01:35:55 2014 +0100 remove whitespace Change-Id: Ie41f7dee77d378bcdd963ea26b0b83d198762f53 diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx index 6899f53..5f3cc13 100644 --- a/vcl/opengl/x11/X11DeviceInfo.cxx +++ b/vcl/opengl/x11/X11DeviceInfo.cxx @@ -270,7 +270,6 @@ bool X11OpenGLDeviceInfo::isDeviceBlocked() SAL_INFO("vcl.opengl", "OS: " << maOS); SAL_INFO("vcl.opengl", "OSRelease: " << maOSRelease); - if (mbIsMesa) { if (mbIsNouveau && version(mnMajorVersion, mnMinorVersion) < version(8,0)) { SAL_WARN("vcl.opengl", "blocked driver version: old nouveau driver (requires mesa 8.0+)"); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
