Search
lxdream.org :: lxdream/src/drivers/gl_fbo.c :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/drivers/gl_fbo.c
changeset 669:ab344e42bca9
prev656:031d23fa6d0b
next736:a02d1475ccfd
author nkeynes
date Mon May 12 10:00:13 2008 +0000 (11 years ago)
permissions -rw-r--r--
last change Cleanup most of the -Wall warnings (getting a bit sloppy...)
Convert FP code to use fixed banks rather than indirect pointer
(3-4% faster this way now)
file annotate diff log raw
1.1 --- a/src/drivers/gl_fbo.c Wed Apr 02 01:46:58 2008 +0000
1.2 +++ b/src/drivers/gl_fbo.c Mon May 12 10:00:13 2008 +0000
1.3 @@ -38,9 +38,9 @@
1.4 static render_buffer_t gl_fbo_create_render_buffer( uint32_t width, uint32_t height );
1.5 static void gl_fbo_destroy_render_buffer( render_buffer_t buffer );
1.6 static gboolean gl_fbo_set_render_target( render_buffer_t buffer );
1.7 -static gboolean gl_fbo_display_render_buffer( render_buffer_t buffer );
1.8 +static void gl_fbo_display_render_buffer( render_buffer_t buffer );
1.9 static void gl_fbo_load_frame_buffer( frame_buffer_t frame, render_buffer_t buffer );
1.10 -static gboolean gl_fbo_display_blank( uint32_t colour );
1.11 +static void gl_fbo_display_blank( uint32_t colour );
1.12 static gboolean gl_fbo_read_render_buffer( unsigned char *target, render_buffer_t buffer, int rowstride, int format );
1.13
1.14 extern uint32_t video_width, video_height;
1.15 @@ -241,7 +241,6 @@
1.16 gl_fbo_attach_texture( fb, buffer->buf_id );
1.17 /* setup the gl context */
1.18 glViewport( 0, 0, buffer->width, buffer->height );
1.19 - glsl_enable_shader(TRUE);
1.20
1.21 return TRUE;
1.22 }
1.23 @@ -250,29 +249,25 @@
1.24 * Render the texture holding the given buffer to the front window
1.25 * buffer.
1.26 */
1.27 -static gboolean gl_fbo_display_render_buffer( render_buffer_t buffer )
1.28 +static void gl_fbo_display_render_buffer( render_buffer_t buffer )
1.29 {
1.30 glFinish();
1.31 gl_fbo_detach();
1.32 - glsl_enable_shader(FALSE);
1.33 gl_display_render_buffer( buffer );
1.34 - return TRUE;
1.35 }
1.36
1.37 static void gl_fbo_load_frame_buffer( frame_buffer_t frame, render_buffer_t buffer )
1.38 {
1.39 glFinish();
1.40 gl_fbo_detach();
1.41 - glsl_enable_shader(FALSE);
1.42 gl_load_frame_buffer( frame, buffer->buf_id );
1.43 }
1.44
1.45 -static gboolean gl_fbo_display_blank( uint32_t colour )
1.46 +static void gl_fbo_display_blank( uint32_t colour )
1.47 {
1.48 glFinish();
1.49 gl_fbo_detach();
1.50 - glsl_enable_shader(FALSE);
1.51 - return gl_display_blank( colour );
1.52 + gl_display_blank( colour );
1.53 }
1.54
1.55 void gl_fbo_detach()
.