Search
lxdream.org :: lxdream/src/drivers/video_glx.c :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/drivers/video_glx.c
changeset 653:3202ff01d48e
prev606:23029426ab8f
next665:99ae9dc4cab7
author nkeynes
date Fri Mar 28 12:32:25 2008 +0000 (13 years ago)
permissions -rw-r--r--
last change Merge lxdream-render branch (643:670) to trunk
file annotate diff log raw
1.1 --- a/src/drivers/video_glx.c Fri Jan 25 05:52:51 2008 +0000
1.2 +++ b/src/drivers/video_glx.c Fri Mar 28 12:32:25 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
.