Merge lp:~robert-ancell/unity-system-compositor/video-blacklist into lp:unity-system-compositor

[Robert Ancell]

Implement regex blacklist for supported OpenGL drivers (copied from Compiz blacklist)

[lp:~robert-ancell/unity-system-compositor/video-blacklist]

79. By Robert Ancell on 2013-09-20

Add build-dep on libgles2-mesa-dev

80. By Robert Ancell on 2013-09-20

Take the opportunity to correct the add_options() usage

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:80
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/34/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-armhf-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-system-compositor-ci/34/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/unity-system-compositor/video-blacklist]

81. By Robert Ancell on 2013-09-20

Override mir::DefaultServerConfiguration::parse_options() correctly

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:81
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/35/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-armhf-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-system-compositor-ci/35/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/unity-system-compositor/video-blacklist]

82. By Robert Ancell on 2013-09-20

Merge with trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:82
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/36/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-armhf-ci/5

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-system-compositor-ci/36/rebuild

review: Approve (continuous-integration)

[lp:~robert-ancell/unity-system-compositor/video-blacklist]

83. By Robert Ancell on 2013-09-20

Load command line options

84. By Robert Ancell on 2013-09-20

Log the blacklist

[Robert Ancell (robert-ancell)]

Requires https://code.launchpad.net/~robert-ancell/mir/fix-config-file-loading/+merge/186865

[Chris Halse Rogers (raof)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:84
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-armhf-ci/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-system-compositor-ci/37/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-28 00:16:30 +0000
+++ CMakeLists.txt	2013-09-20 19:06:20 +0000
@@ -21,6 +21,7 @@
 set(USC_VERSION "${USC_VERSION_MAJOR}.${USC_VERSION_MINOR}.${USC_VERSION_PATCH}")
 
 cmake_minimum_required(VERSION 2.8)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 # Set location of outputs
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
@@ -40,4 +41,8 @@
 find_package(Boost 1.48.0 COMPONENTS chrono date_time filesystem system thread program_options regex REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 
+# Check for GL
+find_package(GLESv2 REQUIRED)
+include_directories (${GLESv2_INCLUDE_DIRS})
+
 add_subdirectory(src/)

=== added directory 'cmake'
=== added file 'cmake/FindGLESv2.cmake'
--- cmake/FindGLESv2.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGLESv2.cmake	2013-09-20 19:06:20 +0000
@@ -0,0 +1,25 @@
+# - Try to find GLESv2
+# Once done this will define
+#  GLESv2_FOUND - System has GLESv2
+#  GLESv2_INCLUDE_DIRS - The GLESv2 include directories
+#  GLESv2_LIBRARIES - The libraries needed to use GLESv2
+
+find_package(PkgConfig)
+pkg_check_modules(PC_GLESv2 QUIET glesv2)
+
+find_path(GLESv2_INCLUDE_DIR GLES2/gl2.h
+          HINTS ${PC_GLESv2_INCLUDEDIR} ${PC_GLESv2_INCLUDE_DIRS})
+
+find_library(GLESv2_LIBRARY GLESv2
+             HINTS ${PC_GLESv2_LIBDIR} ${PC_GLESv2_LIBRARY_DIRS})
+
+set(GLESv2_LIBRARIES ${GLESv2_LIBRARY})
+set(GLESv2_INCLUDE_DIRS ${GLESv2_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set GLESv2_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(GLESv2  DEFAULT_MSG
+                                  GLESv2_LIBRARY GLESv2_INCLUDE_DIR)
+
+mark_as_advanced(GLESv2_INCLUDE_DIR GLESv2_LIBRARY)

=== modified file 'debian/control'
--- debian/control	2013-08-28 07:28:30 +0000
+++ debian/control	2013-09-20 19:06:20 +0000
@@ -7,6 +7,7 @@
                debhelper (>= 9),
                libboost1.48-all-dev | libboost-all-dev,
                libmirserver-dev,
+               libgles2-mesa-dev,
                libprotobuf-dev,
                pkg-config,
                python (>= 2.7),

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-06-26 07:16:43 +0000
+++ src/CMakeLists.txt	2013-09-20 19:06:20 +0000
@@ -29,6 +29,7 @@
   mirserver
   pthread
   ${Boost_LIBRARIES}
+  ${GLESv2_LIBRARIES}
 )
 
 # Install into bin directory

=== modified file 'src/system_compositor.cpp'
--- src/system_compositor.cpp	2013-09-19 13:14:47 +0000
+++ src/system_compositor.cpp	2013-09-20 19:06:20 +0000
@@ -19,6 +19,7 @@
 #include "system_compositor.h"
 
 #include <mir/run_mir.h>
+#include <mir/abnormal_exit.h>
 #include <mir/pause_resume_listener.h>
 #include <mir/shell/application_session.h>
 #include <mir/shell/session.h>
@@ -28,9 +29,13 @@
 
 #include <iostream>
 #include <thread>
+#include <regex.h>
+#include <GLES2/gl2.h>
+#include <boost/algorithm/string.hpp>
 
 namespace msh = mir::shell;
 namespace mi = mir::input;
+namespace po = boost::program_options;
 
 class SystemCompositorServerConfiguration : public mir::DefaultServerConfiguration
 {
@@ -38,12 +43,10 @@
     SystemCompositorServerConfiguration(SystemCompositor *compositor, int argc, char const** argv)
         : mir::DefaultServerConfiguration(argc, argv), compositor{compositor}
     {
-        namespace po = boost::program_options;
-
         add_options()
             ("from-dm-fd", po::value<int>(),  "File descriptor of read end of pipe from display manager [int]")
-            ("to-dm-fd", po::value<int>(),  "File descriptor of write end of pipe to display manager [int]");
-        add_options()
+            ("to-dm-fd", po::value<int>(),  "File descriptor of write end of pipe to display manager [int]")
+            ("blacklist", po::value<std::string>(), "Video blacklist regex to use")
             ("version", "Show version of Unity System Compositor");
     }
 
@@ -61,7 +64,20 @@
     {
         return the_options()->is_set ("version");
     }
-    
+
+    std::string blacklist()
+    {
+        auto x = the_options()->get ("blacklist", "");
+        boost::trim(x);
+        return x;
+    }
+
+    void parse_options(boost::program_options::options_description& options_description, mir::options::ProgramOption& options) const override
+    {
+        mir::DefaultServerConfiguration::parse_options(options_description, options);
+        options.parse_file(options_description, "unity-system-compositor.conf");
+    }
+
     std::shared_ptr<mi::CursorListener> the_cursor_listener() override
     {
         struct NullCursorListener : public mi::CursorListener
@@ -98,6 +114,39 @@
     SystemCompositor *compositor;
 };
 
+bool check_blacklist(std::string blacklist, const char *vendor, const char *renderer, const char *version)
+{
+    if (blacklist.empty())
+        return true;
+
+    std::cerr << "Using blacklist \"" << blacklist << "\"" << std::endl;
+
+    regex_t re;
+    auto result = regcomp (&re, blacklist.c_str(), REG_EXTENDED);
+    if (result == 0)
+    {
+        char driver_string[1024];
+        snprintf (driver_string, 1024, "%s\n%s\n%s",
+                  vendor ? vendor : "",
+                  renderer ? renderer : "",
+                  version ? version : "");
+
+        auto result = regexec (&re, driver_string, 0, NULL, 0);
+        regfree (&re);
+
+        if (result == 0)
+            return false;
+    }
+    else
+    {
+        char error_string[1024];
+        regerror (result, &re, error_string, 1024);
+        std::cerr << "Failed to compile blacklist regex: " << error_string << std::endl;
+    }
+
+    return true;
+}
+
 void SystemCompositor::run(int argc, char const** argv)
 {
     auto c = std::make_shared<SystemCompositorServerConfiguration>(this, argc, argv);
@@ -122,6 +171,16 @@
 
     mir::run_mir(*config, [&](mir::DisplayServer&)
         {
+            auto vendor = (char *) glGetString(GL_VENDOR);
+            auto renderer = (char *) glGetString (GL_RENDERER);
+            auto version = (char *) glGetString (GL_VERSION);
+            std::cerr << "GL_VENDOR = " << vendor << std::endl;
+            std::cerr << "GL_RENDERER = " << renderer << std::endl;
+            std::cerr << "GL_VERSION = " << version << std::endl;
+
+            if (!check_blacklist(c->blacklist(), vendor, renderer, version))
+                throw mir::AbnormalExit ("Video driver is blacklisted, exiting");
+
             guard.thread = std::thread(&SystemCompositor::main, this);
         });
 }