1.1 --- a/src/drivers/gl_common.h	Sat Oct 13 04:01:02 2007 +0000
     1.2 +++ b/src/drivers/gl_common.h	Wed Oct 31 12:43:51 2007 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: gl_common.h,v 1.4 2007-10-13 04:01:02 nkeynes Exp $
     1.6 + * $Id: gl_common.h,v 1.5 2007-10-31 09:10:23 nkeynes Exp $
     1.7   *
     1.8   * Parent for all X11 display drivers.
     1.9   *
    1.10 @@ -31,9 +31,9 @@
    1.11  gboolean hasRequiredGLExtensions();
    1.12  
    1.13  /**
    1.14 - * Generic GL routine to draw the given frame buffer in the display view.
    1.15 + * Generic GL routine to draw the given frame buffer into a render buffer
    1.16   */
    1.17 -gboolean gl_display_frame_buffer( frame_buffer_t frame );
    1.18 +gboolean gl_load_frame_buffer( frame_buffer_t frame, render_buffer_t buffer );
    1.19  
    1.20  /**
    1.21   * Generic GL routine to blank the display view with the specified colour.
    1.22 @@ -41,14 +41,9 @@
    1.23  gboolean gl_display_blank( uint32_t colour );
    1.24  
    1.25  /**
    1.26 - * Copy the frame buffer contents to the specified texture id
    1.27 - */
    1.28 -void gl_frame_buffer_to_tex_rectangle( frame_buffer_t frame, GLuint texid );
    1.29 -
    1.30 -/**
    1.31   * Write a rectangular texture (GL_TEXTURE_RECTANGLE_ARB) to the display frame
    1.32   */
    1.33 -void gl_display_tex_rectangle( GLuint texid, uint32_t texwidth, uint32_t texheight, gboolean invert );
    1.34 +void gl_display_render_buffer( render_buffer_t buffer );
    1.35  
    1.36  /**
    1.37   * Redisplay the last frame.
    1.38 @@ -60,13 +55,15 @@
    1.39   * has already set the appropriate glReadBuffer(); in other words, unless
    1.40   * there's only one buffer this needs to be wrapped.
    1.41   */
    1.42 -gboolean gl_read_render_buffer( render_buffer_t buffer, unsigned char *target );
    1.43 +gboolean gl_read_render_buffer( unsigned char *target, render_buffer_t buffer, 
    1.44 +				int rowstride, int colour_format );
    1.45  
    1.46  
    1.47  /****** FBO handling (gl_fbo.c) ******/
    1.48  gboolean gl_fbo_is_supported();
    1.49  void gl_fbo_shutdown();
    1.50  void gl_fbo_init( display_driver_t driver );
    1.51 +void gl_fbo_detach();
    1.52  
    1.53  /****** Shader handling (gl_sl.c) *****/
    1.54  gboolean glsl_is_supported(void);