From 7591a024f184bd385d35583d19d86c1d5f2531ba Mon Sep 17 00:00:00 2001
From: Tom Schouten <doelie@users.sourceforge.net>
Date: Fri, 1 Sep 2006 13:45:31 +0000
Subject: pdp current darcs merge

svn path=/trunk/externals/pdp/; revision=5816
---
 opengl/system/pdp_3Dcontext_common.c | 2 --
 opengl/system/pdp_3Dcontext_glx.c    | 1 -
 opengl/system/pdp_opengl.c           | 2 ++
 opengl/system/setup.c                | 7 ++++++-
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'opengl/system')

diff --git a/opengl/system/pdp_3Dcontext_common.c b/opengl/system/pdp_3Dcontext_common.c
index 185e2be..86f5657 100644
--- a/opengl/system/pdp_3Dcontext_common.c
+++ b/opengl/system/pdp_3Dcontext_common.c
@@ -28,9 +28,7 @@
 
 #include "pdp_3Dcontext.h"
 #include <GL/gl.h>
-//#include <GL/glx.h>
 #include <GL/glu.h>
-//#include <GL/glut.h>
 
 #define D if (0)
 
diff --git a/opengl/system/pdp_3Dcontext_glx.c b/opengl/system/pdp_3Dcontext_glx.c
index ac25a13..f124686 100644
--- a/opengl/system/pdp_3Dcontext_glx.c
+++ b/opengl/system/pdp_3Dcontext_glx.c
@@ -28,7 +28,6 @@
 #include <GL/gl.h>
 #include <GL/glx.h>
 #include <GL/glu.h>
-//#include <GL/glut.h>
 
 /* all symbols are C-style */
 #ifdef __cplusplus
diff --git a/opengl/system/pdp_opengl.c b/opengl/system/pdp_opengl.c
index 541af75..c8ede29 100644
--- a/opengl/system/pdp_opengl.c
+++ b/opengl/system/pdp_opengl.c
@@ -56,6 +56,7 @@ static void pdp_control_thread(void *x, t_symbol *s, int argc, t_atom *argv)
 
 }
 
+
 /* kernel setup */
 void pdp_opengl_system_setup(void)
 {
@@ -68,6 +69,7 @@ void pdp_opengl_system_setup(void)
 
     /* add pdp_control method for thread */
     pdp_control_addmethod((t_method)pdp_control_thread, gensym("3dthread"));
+
 }
 
 t_pdp_procqueue* pdp_opengl_get_queue(void){return (&_3dp_queue);}
diff --git a/opengl/system/setup.c b/opengl/system/setup.c
index 18d267a..5b40c1b 100644
--- a/opengl/system/setup.c
+++ b/opengl/system/setup.c
@@ -46,10 +46,15 @@ void pdp_3d_subcontext_setup(void);
     //#define D(x) { pdp_post_n( #x ".." ); x; pdp_post("done"); }
 #define D(x) x
 
+
+void pdp_setup(void);
 void pdp_opengl_setup(void)
 {
     int i;
-    post("PDP: pdp_opengl extension library");
+
+    pdp_setup();
+
+    post("PDP: opengl extensions version " PDP_VERSION);
 
     /* setup system */
     D(pdp_opengl_system_setup());
-- 
cgit v1.2.1