1.1 --- a/src/drivers/video_glx.c	Fri Jan 25 05:52:51 2008 +0000
     1.2 +++ b/src/drivers/video_glx.c	Tue Apr 01 08:03:56 2008 +0000
     1.3 @@ -16,12 +16,14 @@
     1.4   * GNU General Public License for more details.
     1.5   */
     1.6  
     1.7 +#include <string.h>
     1.8  #include "display.h"
     1.9 -#include "pvr2/pvr2.h"
    1.10 -#include "drivers/gl_common.h"
    1.11  #include <X11/Xlib.h>
    1.12  #include <GL/glx.h>
    1.13 +#include "pvr2/pvr2.h"
    1.14 +#include "pvr2/glutil.h"
    1.15  #include "drivers/video_glx.h"
    1.16 +#include "drivers/video_gl.h"
    1.17  
    1.18  /**
    1.19   * General X11 parameters. The front-end driver is expected to set this up
    1.20 @@ -168,7 +170,14 @@
    1.21      	WARN( "Not using direct rendering - this is likely to be slow" );
    1.22      }
    1.23  
    1.24 -    texcache_gl_init();
    1.25 +    if( glsl_is_supported() ) {
    1.26 +	//if( !glsl_load_shaders( glsl_vertex_shader_src, glsl_fragment_shader_src ) ) {
    1.27 +	if( !glsl_load_shaders( glsl_vertex_shader_src, NULL ) ) {
    1.28 +            WARN( "Unable to load GL shaders" );
    1.29 +        }
    1.30 +    }
    1.31 +
    1.32 +    pvr2_setup_gl_context();
    1.33      video_x11_display = display;
    1.34      video_x11_window = window;
    1.35