Search
lxdream.org :: lxdream :: r1299:645ccec8dfb0
lxdream 0.9.1
released Jun 29
Download Now
changeset1299:645ccec8dfb0
parent1298:d0eb2307b847
child1300:d18488c8668b
authornkeynes
dateSun May 24 19:46:06 2015 +1000 (4 years ago)
Remove static from gl_load_frame_buffer() - also needed by video_egl.c
Fix error location in gl_frame_buffer_to_tex
src/drivers/video_gl.c
src/drivers/video_gl.h
1.1 --- a/src/drivers/video_gl.c Wed Feb 04 08:38:23 2015 +1000
1.2 +++ b/src/drivers/video_gl.c Sun May 24 19:46:06 2015 +1000
1.3 @@ -441,7 +441,7 @@
1.4 GLenum type = target_to_rgba( tmp, frame->data, frame->width, frame->height, frame->rowstride, frame->colour_format );
1.5 glBindTexture( GL_TEXTURE_2D, tex_id );
1.6 glTexSubImage2D( GL_TEXTURE_2D, 0, 0,0, frame->width, frame->height, GL_RGBA, type, tmp );
1.7 - gl_check_error("gl_load_frame_buffer:glTexSubImage2DBGRA");
1.8 + gl_check_error("gl_frame_buffer_to_tex:glTexSubImage2DBGRA");
1.9 }
1.10
1.11 #else
1.12 @@ -480,7 +480,7 @@
1.13 }
1.14 #endif
1.15
1.16 -static void gl_load_frame_buffer( frame_buffer_t frame, render_buffer_t render )
1.17 +void gl_load_frame_buffer( frame_buffer_t frame, render_buffer_t render )
1.18 {
1.19 gl_frame_buffer_to_tex( frame, render->tex_id );
1.20 }
2.1 --- a/src/drivers/video_gl.h Wed Feb 04 08:38:23 2015 +1000
2.2 +++ b/src/drivers/video_gl.h Sun May 24 19:46:06 2015 +1000
2.3 @@ -40,6 +40,13 @@
2.4 */
2.5 void gl_reset_state();
2.6
2.7 +
2.8 +/**
2.9 + * Generic GL routine to draw the given frame buffer into a (texture-backed)
2.10 + * render buffer.
2.11 + */
2.12 +void gl_load_frame_buffer( frame_buffer_t frame, render_buffer_t buf );
2.13 +
2.14 /**
2.15 * Generic GL routine to blank the display view with the specified colour.
2.16 */
.