filename | src/drivers/video_glx.c |
changeset | 1258:f8a9c0fd2abb |
prev | 1256:a9d29fe74bf3 |
author | nkeynes |
date | Mon Mar 05 11:41:03 2012 +1000 (12 years ago) |
permissions | -rw-r--r-- |
last change | Small cleanups: Refactor the post-windowing setup into gl_init_driver() in video_gl.c Move gl_sl.c into src/drivers and tidy up a bit. Fix OS X compiling plugins with -mdynamic-no-pic |
file | annotate | diff | log | raw |
1.1 --- a/src/drivers/video_glx.c Sun Mar 04 21:10:12 2012 +10001.2 +++ b/src/drivers/video_glx.c Mon Mar 05 11:41:03 2012 +10001.3 @@ -240,17 +240,14 @@1.4 driver->print_info = video_glx_print_info;1.5 driver->capabilities.has_gl = TRUE;1.6 driver->capabilities.depth_bits = glx_depth_bits;1.7 - if( gl_fbo_is_supported() ) { // First preference1.8 - gl_fbo_init(driver);1.9 - } else if( glx_pbuffer_supported ) {1.10 - glx_pbuffer_init(driver);1.11 - } else {1.12 - ERROR( "Unable to create render buffers (requires either EXT_framebuffer_object or GLX 1.3+)" );1.13 + if( !gl_init_driver(driver, !glx_pbuffer_supported) ) {1.14 video_glx_shutdown();1.15 return FALSE;1.16 }1.17 - gl_vbo_init(driver);1.18 - glsl_init(driver);1.19 + if( driver->create_render_buffer == NULL ) {1.20 + /* If we get here, pbuffers are supported and FBO didn't work */1.21 + glx_pbuffer_init(driver);1.22 + }1.23 return TRUE;1.24 }
.