[mutter] Revert "background: downscale background to fit in texture limits"
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] Revert "background: downscale background to fit in texture limits"
- Date: Mon, 1 Jul 2013 11:33:46 +0000 (UTC)
commit fd7db8e6b3ae985ae2c7b8a8eec2e3f0ea71676f
Author: Ray Strode <rstrode redhat com>
Date: Mon Jul 1 07:31:25 2013 -0400
Revert "background: downscale background to fit in texture limits"
This reverts commit 15e01152da335f5a9e7617674ffa54cb1bdef957.
( accidentally pushed this when trying to push commit
b7840bec7d135fec3c268b5eab1233d6c6c7cdf6 )
src/compositor/meta-background.c | 30 ------------------------------
1 files changed, 0 insertions(+), 30 deletions(-)
---
diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c
index 568614f..76477c8 100644
--- a/src/compositor/meta-background.c
+++ b/src/compositor/meta-background.c
@@ -32,8 +32,6 @@
#include <clutter/clutter.h>
-#include <GL/gl.h>
-
#include "cogl-utils.h"
#include "compositor-private.h"
#include "mutter-enum-types.h"
@@ -973,7 +971,6 @@ load_file (GTask *task,
{
GError *error = NULL;
GdkPixbuf *pixbuf;
- int max_texture_size = 0;
pixbuf = gdk_pixbuf_new_from_file (task_data->filename,
&error);
@@ -984,33 +981,6 @@ load_file (GTask *task,
return;
}
- glGetIntegerv (GL_MAX_TEXTURE_SIZE, &max_texture_size);
-
- if (glGetError () != GL_NO_ERROR)
- max_texture_size = 0;
-
- if (max_texture_size > 0) {
- double width, height;
-
- width = gdk_pixbuf_get_width (pixbuf);
- height = gdk_pixbuf_get_height (pixbuf);
-
- if (width > max_texture_size || height > max_texture_size) {
- GdkPixbuf *scaled_pixbuf;
-
- if (width > height) {
- width = max_texture_size;
- height *= max_texture_size / width;
- } else {
- width *= max_texture_size / height;
- height = max_texture_size;
- }
- scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR);
- g_object_unref (pixbuf);
- pixbuf = scaled_pixbuf;
- }
- }
-
g_task_return_pointer (task, pixbuf, (GDestroyNotify) g_object_unref);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]