[gtk+/wip/matthiasc/gsk-renderer] gsk: Improve debug output a bit
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/matthiasc/gsk-renderer] gsk: Improve debug output a bit
- Date: Wed, 3 Aug 2016 01:11:07 +0000 (UTC)
commit a3fd90bb6769b110e66253052be8f8d15d782166
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Aug 2 21:08:52 2016 -0400
gsk: Improve debug output a bit
Reflect the tree structure in the indentation, and avoid
the matrices.
gsk/gskglrenderer.c | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/gsk/gskglrenderer.c b/gsk/gskglrenderer.c
index 22e1558..95d491e 100644
--- a/gsk/gskglrenderer.c
+++ b/gsk/gskglrenderer.c
@@ -359,6 +359,18 @@ gsk_gl_renderer_update_frustum (GskGLRenderer *self,
#define N_VERTICES 6
+static inline int
+node_depth (GskRenderNode *node)
+{
+ int ret = 0;
+ while (node->parent)
+ {
+ ret++;
+ node = node->parent;
+ }
+ return ret;
+}
+
static void
render_item (GskGLRenderer *self,
RenderItem *item)
@@ -406,12 +418,12 @@ render_item (GskGLRenderer *self,
glUniform1f (item->render_data.alpha_location, opacity);
/* Pass the mvp to the vertex shader */
- GSK_NOTE (OPENGL, graphene_matrix_print (&item->mvp));
graphene_matrix_to_float (&item->mvp, mvp);
glUniformMatrix4fv (item->render_data.mvp_location, 1, GL_FALSE, mvp);
/* Draw the quad */
- GSK_NOTE (OPENGL, g_print ("Drawing item <%s>[%p] (w:%g, h:%g) with opacity: %g\n",
+ GSK_NOTE (OPENGL, g_print ("%*sDrawing item <%s>[%p] (w:%g, h:%g) with opacity: %g\n",
+ 2 * node_depth (item->node), "",
item->name,
item,
item->size.width, item->size.height,
@@ -455,7 +467,6 @@ render_item (GskGLRenderer *self,
glUniform1f (item->render_data.alpha_location, item->opacity);
/* Pass the mvp to the vertex shader */
- GSK_NOTE (OPENGL, graphene_matrix_print (&item->mvp));
graphene_matrix_to_float (&item->mvp, mvp);
glUniformMatrix4fv (item->render_data.mvp_location, 1, GL_FALSE, mvp);
@@ -704,7 +715,8 @@ gsk_gl_renderer_add_render_item (GskGLRenderer *self,
self->gl_mag_filter);
}
- GSK_NOTE (OPENGL, g_print ("Adding node <%s>[%p] to render items\n",
+ GSK_NOTE (OPENGL, g_print ("%*sAdding node <%s>[%p] to render items\n",
+ 2 * node_depth (node), "",
node->name != NULL ? node->name : "unnamed",
node));
g_array_append_val (render_items, item);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]