From 40caded03095b550dd4b916fea8ef84b875def09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Mon, 20 Jun 2011 19:48:16 -0400
Subject: [PATCH] compositor: Only use GL_LINEAR when surface is transformed

---
 compositor/compositor.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/compositor/compositor.c b/compositor/compositor.c
index 255dd5fc..510f5565 100644
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@@ -180,8 +180,6 @@ wlsc_surface_create(struct wlsc_compositor *compositor,
 	glBindTexture(GL_TEXTURE_2D, surface->texture);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
 	surface->compositor = compositor;
 	surface->visual = NULL;
@@ -518,6 +516,7 @@ wlsc_surface_draw(struct wlsc_surface *es,
 	struct wlsc_compositor *ec = es->compositor;
 	GLfloat *v;
 	pixman_region32_t repaint;
+	GLint filter;
 	int n;
 
 	pixman_region32_init_rect(&repaint,
@@ -536,12 +535,18 @@ wlsc_surface_draw(struct wlsc_surface *es,
 		glDisable(GL_BLEND);
 	}
 
-	if (es->transform == NULL)
+	if (es->transform == NULL) {
+		filter = GL_NEAREST;
 		n = texture_region(es, &repaint);
-	else
+	} else {
+		filter = GL_LINEAR;
 		n = texture_transformed_surface(es);
+	}
 
 	glBindTexture(GL_TEXTURE_2D, es->texture);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter);
+
 	v = ec->vertices.data;
 	glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof *v, &v[0]);
 	glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof *v, &v[2]);