Search
lxdream.org :: lxdream/src/drivers/gl_fbo.c :: diff
Latest Version
lxdream 0.9.1
released Jun 29
Download Now
Navigation
News Download Mailing Lists Mercurial Issues Dreamcast Wiki FAQ Forums
tree revision 635:76c63aac3590 lxdream-render
Jump to:
summary | tree | shortlog | changelog | graph | changeset

 

filename src/drivers/gl_fbo.c
changeset 635:76c63aac3590
prev561:533f6b478071
next656:031d23fa6d0b
author nkeynes
date Thu Feb 14 13:54:11 2008 +0000 (15 years ago)
branchlxdream-render
permissions -rw-r--r--
last change Commit render work in progress. Main changes:
* Preliminary OSMesa support
* Move the generic gl code out to pvr2/
* Implement scene data structure + reader
* Remove the 1/z adjustments
file annotate diff log raw 
     1.1 --- a/src/drivers/gl_fbo.c	Tue Jan 01 05:08:38 2008 +0000

     1.2 +++ b/src/drivers/gl_fbo.c	Thu Feb 14 13:54:11 2008 +0000

     1.3 @@ -27,7 +27,8 @@

     1.4  #include <stdlib.h>

     1.5  #include "lxdream.h"

     1.6  #include "display.h"

     1.7 -#include "drivers/gl_common.h"

     1.8 +#include "drivers/video_gl.h"

     1.9 +#include "pvr2/glutil.h"

    1.10  

    1.11  #define MAX_FRAMEBUFFERS 2

    1.12  #define MAX_TEXTURES_PER_FB 4

    1.13 @@ -238,6 +239,7 @@

    1.14      gl_fbo_attach_texture( fb, buffer->buf_id );

    1.15      /* setup the gl context */

    1.16      glViewport( 0, 0, buffer->width, buffer->height );

    1.17 +    glsl_enable_shader(TRUE);

    1.18      

    1.19      return TRUE;

    1.20  }

    1.21 @@ -250,6 +252,7 @@

    1.22  {

    1.23      glFinish();

    1.24      gl_fbo_detach();

    1.25 +    glsl_enable_shader(FALSE);

    1.26      gl_display_render_buffer( buffer );

    1.27      return TRUE;

    1.28  }

    1.29 @@ -258,6 +261,7 @@

    1.30  {

    1.31      glFinish();

    1.32      gl_fbo_detach();

    1.33 +    glsl_enable_shader(FALSE);

    1.34      gl_load_frame_buffer( frame, buffer->buf_id );

    1.35  }

    1.36  

    1.37 @@ -265,6 +269,7 @@

    1.38  {

    1.39      glFinish();

    1.40      gl_fbo_detach();

    1.41 +    glsl_enable_shader(FALSE);

    1.42      return gl_display_blank( colour );

    1.43  }

    1.44
.