← Back to branch summary

~unity-team/unity/trunk

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/unityshell.cpp

  • Committer: CI Train Bot
  • Author(s): andrea.azzarone at canonical
  • Date: 2015-09-10 15:37:40 UTC
  • mfrom: (3999.4.1 unity)
  • Revision ID: ci-train-bot@canonical.com-20150910153740-qpadt3tbbgqkbju0
Merge patch from https://launchpadlibrarian.net/216192448/llvm-fix.patch Fixes: #1491555
Approved by: Marco Trevisan (Treviño)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/unityshell.cpp
287
287
 
288
288
  if (renderer.find("Software Rasterizer") != std::string::npos ||
289
289
      renderer.find("Mesa X11") != std::string::npos ||
290
 
      renderer.find("LLVM") != std::string::npos ||
291
 
      renderer.find("on softpipe") != std::string::npos ||
 
290
      renderer.find("llvmpipe") != std::string::npos ||
 
291
      renderer.find("softpipe") != std::string::npos ||
292
292
      (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 1) ||
293
293
       optionGetLowGraphicsMode())
294
294
    {