--- a/src/drivers/video_glx.c	Fri Jan 25 05:52:51 2008 +0000
+++ b/src/drivers/video_glx.c	Thu Feb 14 13:54:11 2008 +0000
@@ -16,12 +16,14 @@
  * GNU General Public License for more details.
  */
 
+#include <string.h>
 #include "display.h"
-#include "pvr2/pvr2.h"
-#include "drivers/gl_common.h"
 #include <X11/Xlib.h>
 #include <GL/glx.h>
+#include "pvr2/pvr2.h"
+#include "pvr2/glutil.h"
 #include "drivers/video_glx.h"
+#include "drivers/video_gl.h"
 
 /**
  * General X11 parameters. The front-end driver is expected to set this up
@@ -168,6 +170,13 @@
     	WARN( "Not using direct rendering - this is likely to be slow" );
     }
 
+    if( glsl_is_supported() ) {
+	//if( !glsl_load_shaders( glsl_vertex_shader_src, glsl_fragment_shader_src ) ) {
+	if( !glsl_load_shaders( glsl_vertex_shader_src, NULL ) ) {
+            WARN( "Unable to load GL shaders" );
+        }
+    }
+
     texcache_gl_init();
     video_x11_display = display;
     video_x11_window = window;