From d1004540ed1e61b03752a9aba8a641b9fbc406f6 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Sat, 23 Jan 2010 19:25:41 +0000 Subject: [PATCH] Debugging and code formatting --- examples/sorting/mkfile | 7 ++++--- examples/sorting/sort.c | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/sorting/mkfile b/examples/sorting/mkfile index e65f26d..9e83961 100644 --- a/examples/sorting/mkfile +++ b/examples/sorting/mkfile @@ -1,7 +1,8 @@ MKSHELL=/usr/lib/plan9/bin/rc PROGS=sort tes -LIBS=`{pkg-config --libs gtkglext-1.0} -CFLAGS=-Wall -g '--std=c99' `{pkg-config --cflags gtkglext-1.0} +PKGS=gtkglext-1.0 -default:V: tes-run +sort_cflags=-p -pg -O3 + +default:V: sort-run <$HOME/lib/mkcommon diff --git a/examples/sorting/sort.c b/examples/sorting/sort.c index 745e1fc..9ad01fa 100644 --- a/examples/sorting/sort.c +++ b/examples/sorting/sort.c @@ -33,7 +33,7 @@ static gfloat *sort_start() static void sort_end(gfloat *data) { int vertsize = sizeof(vert_t)/sizeof(gfloat); - int count = glRenderMode(GL_RENDER); + int nvals = glRenderMode(GL_RENDER); /* Set up screen coords */ gint view[4]; @@ -49,12 +49,12 @@ static void sort_end(gfloat *data) /* Sort the vertexes (this only works with all-triangles */ int trisize = 2*sizeof(gfloat) + 3*sizeof(vert_t); - int ntris = count / trisize; + int ntris = nvals*sizeof(gfloat) / trisize; g_print("%d, %d, %d\n", sizeof(gfloat), trisize, ntris); - qsort(data, ntris*4, trisize, sort_cmp); + qsort(data, ntris, trisize, sort_cmp); /* Draw the data */ - for (int i = 0; i < count;) { + for (int i = 0; i < nvals;) { gfloat token = data[i++]; if (token == GL_POLYGON_TOKEN) { gfloat n = data[i++]; @@ -84,6 +84,7 @@ static void sort_end(gfloat *data) g_error("Unknown token: %f\n", token); } } + g_free(data); } static gboolean on_expose(GtkWidget *drawing, GdkEventExpose *event, gpointer _) -- 2.43.2