Merge lp:~teemperor/pantheon-greeter/without-gl into lp:~elementary-pantheon/pantheon-greeter/trunk

[Raphael Isemann]

I think we can merge this branch without issues. Please test some bigger wallpaper with this branch.

[Cody Garver (codygarver)]

Wasn't there a bug involving gl where if the wallpaper was too large, it made a black background? I seem to remember gl being the fix for that. If that's accurate, how would this handle a huge wallpaper?

review: Needs Information

[Sergey "Shnatsel" Davidoff (shnatsel)]

Either experimental or very latest Clutter can tile textures to be able to process images bigger than the hardware allows natively. However, last time I checked this feature was under experimental API, which means that you might need to change some Clutter API calls.

If such functionality in Clutter still isn't stable and is not going to be stable by 14.04, we're probably better off with developing an OpenGL ES codepath equivalent to the current OpenGL one.

Unmerged revisions

214. By Raphael Isemann on 2013-08-27

removed gl dep for arm-testing

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-08 18:27:22 +0000
+++ CMakeLists.txt	2013-10-26 15:32:36 +0000
@@ -51,7 +51,6 @@
     x11
     clutter-gtk-1.0
     indicator-0.4
-    gl
     posix-fixes
 OPTIONS
     --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi

=== modified file 'src/Wallpaper.vala'
--- src/Wallpaper.vala	2013-10-08 18:16:40 +0000
+++ src/Wallpaper.vala	2013-10-26 15:32:36 +0000
@@ -25,8 +25,6 @@
 
     bool second = false;
 
-    int gpu_limit;
-
     string[] cache_path = {};
     Gdk.Pixbuf[] cache_pixbuf = {};
     int max_cache = 3;
@@ -46,10 +44,6 @@
 
         add_child (background);
         add_child (background_s);
-
-        GL.GLint result = 1;
-        GL.glGetIntegerv(GL.GL_MAX_TEXTURE_SIZE, out result);
-        gpu_limit = result;
     }
 
     string get_default () {
@@ -149,9 +143,7 @@
      * screen size to save memory.
      */
     public Gdk.Pixbuf validate_pixbuf (Gdk.Pixbuf pixbuf) {
-        Gdk.Pixbuf result = scale_to_rect (pixbuf, gpu_limit, gpu_limit);
-        result = scale_to_rect (pixbuf, screen_width, screen_height);
-        return result;
+        return pixbuf;
     }
 
     /**

=== 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);
-}