Update examples

- Fix crash in teapot plugin
- Use direct rendering in gl example

diff --git a/examples/gl/gl.c b/examples/gl/gl.c
index 378fd9a65ae884b1e72d7e81fa7ec98ee3f77ff7..ca7811f8493c1c488c2c37114fe22bbeb678e5d3 100644 (file)
--- a/examples/gl/gl.c
+++ b/examples/gl/gl.c
@@ -98,7 +98,7 @@ gpointer setup(GtkWidget *widget)
                                GLX_DEPTH_SIZE,  1,
                                None};
        XVisualInfo *xvinfo  = glXChooseVisual(xdisplay, nscreen, attribs);
                                GLX_DEPTH_SIZE,  1,
                                None};
        XVisualInfo *xvinfo  = glXChooseVisual(xdisplay, nscreen, attribs);

-       GLXContext   context = glXCreateContext(xdisplay, xvinfo, 0, False);
+       GLXContext   context = glXCreateContext(xdisplay, xvinfo, 0, True);

 
        /* Fix up colormap */
        GdkVisual   *visual  = gdk_x11_screen_lookup_visual(screen, xvinfo->visualid);
 
        /* Fix up colormap */
        GdkVisual   *visual  = gdk_x11_screen_lookup_visual(screen, xvinfo->visualid);

diff --git a/examples/gl/mkfile b/examples/gl/mkfile
index 54704413e679caed6655a61c8d8eabe5e3f323ae..ecb68033f38c5e93a2a68cfc477e08ebab2cde0a 100644 (file)
--- a/examples/gl/mkfile
+++ b/examples/gl/mkfile
@@ -8,12 +8,12 @@ default:V: run
 # GtkGLExt
 #CPPFLAGS=-DSYS_GTKGLEXT
 #CFLAGS=`{pkg-config --cflags gtkglext-1.0} --std=c99
 # GtkGLExt
 #CPPFLAGS=-DSYS_GTKGLEXT
 #CFLAGS=`{pkg-config --cflags gtkglext-1.0} --std=c99

-#LIBS=-`{pkg-config --libs gtkglext-1.0}
+#LIBS=`{pkg-config --libs gtkglext-1.0} -lm

 #default:V: run
 
 # X11
 #CPPFLAGS=-DSYS_X11
 #default:V: run
 
 # X11
 #CPPFLAGS=-DSYS_X11

-#LIBS=-lGL
+#LIBS=-lGL -lm

 #default:V: run
 
 # Mac OSX
 #default:V: run
 
 # Mac OSX

diff --git a/examples/plugin/teapot.c b/examples/plugin/teapot.c
index 1de1230fc52e1ff7bec6e41484276d990885df2d..1aaa2349d8d0e27aea2b853010a08e70bf3cde2a 100644 (file)
--- a/examples/plugin/teapot.c
+++ b/examples/plugin/teapot.c
@@ -120,8 +120,6 @@ static void grits_plugin_teapot_dispose(GObject *gobject)
 static void grits_plugin_teapot_class_init(GritsPluginTeapotClass *klass)
 {
        g_debug("GritsPluginTeapot: class_init");
 static void grits_plugin_teapot_class_init(GritsPluginTeapotClass *klass)
 {
        g_debug("GritsPluginTeapot: class_init");

-       int argc = 1; char *argv[] = {"", NULL};
-       glutInit(&argc, argv);

        GObjectClass *gobject_class = (GObjectClass*)klass;
        gobject_class->dispose  = grits_plugin_teapot_dispose;
 }
        GObjectClass *gobject_class = (GObjectClass*)klass;
        gobject_class->dispose  = grits_plugin_teapot_dispose;
 }