Merge lp:~cameronnemo/pantheon-greeter/optional-gl into lp:~elementary-pantheon/pantheon-greeter/trunk

[Cameron Norman]

This leaves out GL specific code if GL is not available.

This is Raphael Isemann's branch, just rebased on current trunk (I had to fix a merge conflict). There is a bounty on the bug, but I think that if Raphael is assigned to the bug he will get the bounty so it is probably no problem.

The original merge request was rejected because it did not compile when GL was found (I do not think it was reviewed for without GL), but I tested this branch and it does compile locally.

[kay van der Zander (kay20)]

 crop the packages and options in a cmake variable like sources. this makes the if smaller and removes duplicate of vala_precompile.

review: Needs Fixing

[kay van der Zander (kay20)]

also the bug report stated that it should work it egl also known as opengl es.
to fix the bug you also need to make it working with opengl es function: https://www.khronos.org/registry/gles/specs/1.1/es_cm_spec_1.1.12.pdf

otherwise we would lose functionality/apperance on arm build.

[Zisu Andrei (matzipan)]

I'm afraid this MR doesn't try to solve the bug.

review: Disapprove

Unmerged revisions

277. By Cameron Norman on 2014-08-07

Raphael Isemann: make GL usage optional

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-25 18:49:46 +0000
+++ CMakeLists.txt	2014-08-07 05:25:11 +0000
@@ -39,23 +39,47 @@
 file(GLOB_RECURSE sources src/*.vala)
 
 include (ValaPrecompile)
-vala_precompile (VALA_C
-    ${sources}
-    ${CMAKE_BINARY_DIR}/src/config.vala
-PACKAGES
-    granite
-    liblightdm-gobject-1
-    posix
-    gdk-pixbuf-2.0
-    gdk-x11-3.0
-    x11
-    clutter-gtk-1.0
-    indicator-0.4
-    gl
-    posix-fixes
-OPTIONS
-    --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
-)
+
+pkg_check_modules (GL QUIET gl)
+if (GL_FOUND)
+    pkg_check_modules(GL REQUIRED gl)
+    vala_precompile (VALA_C
+        ${sources}
+        ${CMAKE_BINARY_DIR}/src/config.vala
+    PACKAGES
+        granite
+        liblightdm-gobject-1
+        posix
+        gdk-pixbuf-2.0
+        gdk-x11-3.0
+        x11
+        clutter-gtk-1.0
+        indicator-0.4
+        gl
+        posix-fixes
+    OPTIONS
+        --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
+        --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi-gl
+        --define=USE_GL
+    )
+else (GL_FOUND)
+    vala_precompile (VALA_C
+        ${sources}
+        ${CMAKE_BINARY_DIR}/src/config.vala
+    PACKAGES
+        granite
+        liblightdm-gobject-1
+        posix
+        gdk-pixbuf-2.0
+        gdk-x11-3.0
+        x11
+        clutter-gtk-1.0
+        indicator-0.4
+        posix-fixes
+    OPTIONS
+        --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
+    )
+endif (GL_FOUND)
 
 add_subdirectory (po)
 

=== modified file 'src/Wallpaper.vala'
--- src/Wallpaper.vala	2014-03-13 17:16:53 +0000
+++ src/Wallpaper.vala	2014-08-07 05:25:11 +0000
@@ -36,7 +36,9 @@
      */
     Queue<GtkClutter.Texture> unused_wallpapers = new Queue<GtkClutter.Texture> ();
 
+#if USE_GL
     int gpu_limit;
+#endif
 
     string[] cache_path = {};
     Gdk.Pixbuf[] cache_pixbuf = {};
@@ -48,9 +50,11 @@
     public int screen_height { get; set; }
 
     public Wallpaper () {
+#if USE_GL
         GL.GLint result = 1;
         GL.glGetIntegerv(GL.GL_MAX_TEXTURE_SIZE, out result);
         gpu_limit = result;
+#endif
     }
 
     string get_default () {
@@ -86,10 +90,12 @@
                 var cancelable = new Cancellable ();
                 loading_wallpapers.append (cancelable);
                 InputStream stream = yield file.read_async (GLib.Priority.DEFAULT);
+#if USE_GL
                 buf = yield Gdk.Pixbuf.new_from_stream_async (stream, cancelable);
                 loading_wallpapers.remove (cancelable);
                 // we downscale the pixbuf as far as we can on the CPU
                 buf = validate_pixbuf (buf);
+#endif
                 //add loaded wallpapers and paths to cache
                 cache_path += path;
                 cache_pixbuf += buf;
@@ -161,6 +167,7 @@
         return null;
     }
 
+#if USE_GL
     /**
      * makes the pixbuf fit inside the GPU limit and scales it to
      * screen size to save memory.
@@ -170,6 +177,7 @@
         result = scale_to_rect (pixbuf, screen_width, screen_height);
         return result;
     }
+#endif
 
     /**
      * Scales the pixbuf down to fit in the given dimensions.

=== added directory 'vapi-gl'
=== added file 'vapi-gl/gl.vapi'
--- vapi-gl/gl.vapi	1970-01-01 00:00:00 +0000
+++ vapi-gl/gl.vapi	2014-08-07 05:25:11 +0000
@@ -0,0 +1,17 @@
+/* gl.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "GL", gir_namespace = "GL", gir_version = "1.0", lower_case_cprefix = "gl_")]
+namespace GL {
+	[CCode (cheader_filename = "GL/gl.h", cname = "GLint")]
+	[SimpleType]
+	public struct GLint : int {
+	}
+	[CCode (cheader_filename = "GL/gl.h", cname = "GLenum")]
+	[SimpleType]
+	public struct GLenum : uint {
+	}
+	[CCode (cheader_filename = "GL/gl.h", cname = "GL_MAX_TEXTURE_SIZE")]
+	public const int GL_MAX_TEXTURE_SIZE;
+	[CCode (cheader_filename = "GL/gl.h", cname = "glGetIntegerv")]
+	public static void glGetIntegerv (GL.GLenum pname, out unowned GL.GLint @params);
+}

=== removed file 'vapi/gl.vapi'
--- vapi/gl.vapi	2013-02-17 13:12:35 +0000
+++ vapi/gl.vapi	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-/* gl.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "GL", gir_namespace = "GL", gir_version = "1.0", lower_case_cprefix = "gl_")]
-namespace GL {
-	[CCode (cheader_filename = "GL/gl.h", cname = "GLint")]
-	[SimpleType]
-	public struct GLint : int {
-	}
-	[CCode (cheader_filename = "GL/gl.h", cname = "GLenum")]
-	[SimpleType]
-	public struct GLenum : uint {
-	}
-	[CCode (cheader_filename = "GL/gl.h", cname = "GL_MAX_TEXTURE_SIZE")]
-	public const int GL_MAX_TEXTURE_SIZE;
-	[CCode (cheader_filename = "GL/gl.h", cname = "glGetIntegerv")]
-	public static void glGetIntegerv (GL.GLenum pname, out unowned GL.GLint @params);
-}