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

Proposed by Raphael Isemann on 2013-10-26
Status: Rejected
Rejected by: Cody Garver on 2016-02-03
Proposed branch: lp:~teemperor/pantheon-greeter/without-gl
Merge into: lp:~elementary-pantheon/pantheon-greeter/trunk
Diff against target: 68 lines (+1/-27)
3 files modified
CMakeLists.txt (+0/-1)
src/Wallpaper.vala (+1/-9)
vapi/gl.vapi (+0/-17)
To merge this branch: bzr merge lp:~teemperor/pantheon-greeter/without-gl
Reviewer Review Type Date Requested Status
Cody Garver 2013-10-26 Needs Information on 2013-10-26
Review via email: mp+192783@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Cody Garver (codygarver) wrote :

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-10-08 18:27:22 +0000
3+++ CMakeLists.txt 2013-10-26 15:32:36 +0000
4@@ -51,7 +51,6 @@
5 x11
6 clutter-gtk-1.0
7 indicator-0.4
8- gl
9 posix-fixes
10 OPTIONS
11 --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
12
13=== modified file 'src/Wallpaper.vala'
14--- src/Wallpaper.vala 2013-10-08 18:16:40 +0000
15+++ src/Wallpaper.vala 2013-10-26 15:32:36 +0000
16@@ -25,8 +25,6 @@
17
18 bool second = false;
19
20- int gpu_limit;
21-
22 string[] cache_path = {};
23 Gdk.Pixbuf[] cache_pixbuf = {};
24 int max_cache = 3;
25@@ -46,10 +44,6 @@
26
27 add_child (background);
28 add_child (background_s);
29-
30- GL.GLint result = 1;
31- GL.glGetIntegerv(GL.GL_MAX_TEXTURE_SIZE, out result);
32- gpu_limit = result;
33 }
34
35 string get_default () {
36@@ -149,9 +143,7 @@
37 * screen size to save memory.
38 */
39 public Gdk.Pixbuf validate_pixbuf (Gdk.Pixbuf pixbuf) {
40- Gdk.Pixbuf result = scale_to_rect (pixbuf, gpu_limit, gpu_limit);
41- result = scale_to_rect (pixbuf, screen_width, screen_height);
42- return result;
43+ return pixbuf;
44 }
45
46 /**
47
48=== removed file 'vapi/gl.vapi'
49--- vapi/gl.vapi 2013-02-17 13:12:35 +0000
50+++ vapi/gl.vapi 1970-01-01 00:00:00 +0000
51@@ -1,17 +0,0 @@
52-/* gl.vapi generated by vapigen, do not modify. */
53-
54-[CCode (cprefix = "GL", gir_namespace = "GL", gir_version = "1.0", lower_case_cprefix = "gl_")]
55-namespace GL {
56- [CCode (cheader_filename = "GL/gl.h", cname = "GLint")]
57- [SimpleType]
58- public struct GLint : int {
59- }
60- [CCode (cheader_filename = "GL/gl.h", cname = "GLenum")]
61- [SimpleType]
62- public struct GLenum : uint {
63- }
64- [CCode (cheader_filename = "GL/gl.h", cname = "GL_MAX_TEXTURE_SIZE")]
65- public const int GL_MAX_TEXTURE_SIZE;
66- [CCode (cheader_filename = "GL/gl.h", cname = "glGetIntegerv")]
67- public static void glGetIntegerv (GL.GLenum pname, out unowned GL.GLint @params);
68-}

Subscribers

People subscribed via source and target branches