commit c73bd54b586ab13b2e70b450669d4ea3a3fee608
author Pekka Paalanen <ppaalanen@gmail.com> Mon Sep 03 16:48:43 2012 +0300
committer Kristian Høgsberg <krh@bitplanet.net> Tue Sep 04 16:14:39 2012 -0400
tree 46b0e7b20b120acedf3860693767be1b4b0ea77b
parent 2abe2e6d41c3460d6306dcd547fe58740c68f0ca

compositor: fix fan_debug mode

- make it respect output transforms by making sure the uniforms are
  up-to-date

- properly restore the current shader program, in case it was
  overridden

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 918b455..4288e89 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1269,7 +1269,7 @@
 	glUniform4fv(compositor->solid_shader.color_uniform, 1,
 			color[color_idx++ % ARRAY_SIZE(color)]);
 	glDrawElements(GL_LINES, nelems, GL_UNSIGNED_SHORT, buffer);
-	glUseProgram(surface->shader->program);
+	glUseProgram(compositor->current_shader->program);
 	free(buffer);
 }
 
@@ -1369,6 +1369,11 @@
 
 	glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
+	if (ec->fan_debug) {
+		weston_compositor_use_shader(ec, &ec->solid_shader);
+		weston_shader_uniforms(&ec->solid_shader, es, output);
+	}
+
 	weston_compositor_use_shader(ec, es->shader);
 	weston_shader_uniforms(es->shader, es, output);