revision 1246:887f7b0ac7f3
summary |
tree |
shortlog |
changelog |
graph |
changeset |
raw | bz2 | zip | gz changeset | 1246:887f7b0ac7f3 |
parent | 1245:01e0020adf88 |
child | 1247:e48ea82eb72c |
author | nkeynes |
date | Sat Mar 03 00:17:36 2012 +1000 (9 years ago) |
Fix GLX compile
![]() | src/drivers/video_gl.c | view | annotate | diff | log | |
![]() | src/drivers/video_gl.h | view | annotate | diff | log | |
![]() | src/drivers/video_glx.c | view | annotate | diff | log |
1.1 --- a/src/drivers/video_gl.c Fri Mar 02 23:49:10 2012 +10001.2 +++ b/src/drivers/video_gl.c Sat Mar 03 00:17:36 2012 +10001.3 @@ -99,7 +99,7 @@1.4 /**1.5 * Setup the gl context for writes to the display output.1.6 */1.7 -static void gl_framebuffer_setup()1.8 +void gl_framebuffer_setup()1.9 {1.10 glViewport( 0, 0, video_width, video_height );1.11 glLoadMatrixf(video_box.viewMatrix);1.12 @@ -113,14 +113,14 @@1.13 glEnableClientState( GL_TEXTURE_COORD_ARRAY );1.14 }1.16 -static void gl_framebuffer_cleanup()1.17 +void gl_framebuffer_cleanup()1.18 {1.19 glDisableClientState( GL_VERTEX_ARRAY );1.20 glDisableClientState( GL_COLOR_ARRAY );1.21 glDisableClientState( GL_TEXTURE_COORD_ARRAY );1.22 }1.23 #else1.24 -static void gl_framebuffer_setup()1.25 +void gl_framebuffer_setup()1.26 {1.27 glViewport( 0, 0, video_width, video_height );1.28 glBlendFunc( GL_ONE, GL_ZERO );1.29 @@ -132,7 +132,7 @@1.30 glsl_set_basic_shader_primary_texture(0);1.31 }1.33 -static void gl_framebuffer_cleanup()1.34 +void gl_framebuffer_cleanup()1.35 {1.36 glsl_clear_shader();1.37 }
2.1 --- a/src/drivers/video_gl.h Fri Mar 02 23:49:10 2012 +10002.2 +++ b/src/drivers/video_gl.h Sat Mar 03 00:17:36 2012 +10002.3 @@ -71,6 +71,8 @@2.4 int rowstride, int colour_format );2.7 +void gl_framebuffer_setup(void);2.8 +void gl_framebuffer_cleanup(void);2.9 /****** FBO handling (gl_fbo.c) ******/2.10 gboolean gl_fbo_is_supported();2.11 void gl_fbo_shutdown();
3.1 --- a/src/drivers/video_glx.c Fri Mar 02 23:49:10 2012 +10003.2 +++ b/src/drivers/video_glx.c Sat Mar 03 00:17:36 2012 +10003.3 @@ -397,13 +397,14 @@3.4 int bpp = colour_formats[frame->colour_format].bpp;3.5 int rowstride = (frame->rowstride / bpp) - frame->width;3.7 - gl_reset_state();3.8 + gl_framebuffer_setup();3.9 glPixelStorei( GL_UNPACK_ROW_LENGTH, rowstride );3.10 glRasterPos2f(0.375, frame->height-0.375);3.11 glPixelZoom( 1.0, 1.0 );3.12 glDrawPixels( frame->width, frame->height, format, type, frame->data );3.13 glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 );3.14 glFlush();3.15 + gl_framebuffer_cleanup();3.16 }3.18 static void glx_pbuffer_display_blank( uint32_t colour )
.