Search
lxdream.org :: lxdream/src/drivers/video_glx.c :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/drivers/video_glx.c
changeset 1222:a4545699a82b
prev1159:580436b01b6c
next1236:d93175c36387
author nkeynes
date Wed Feb 15 17:54:51 2012 +1000 (7 years ago)
permissions -rw-r--r--
last change Use GL_TEXTURE_2D instead of GL_TEXTURE_RECTANGLE_ARB for frame buffers, for
systems that don't provide the latter (and there's not really much
difference anyway).
Add macro wrangling for GL_DEPTH24_STENCIL8 format
file annotate diff log raw
1.1 --- a/src/drivers/video_glx.c Wed Jan 19 17:50:09 2011 +1000
1.2 +++ b/src/drivers/video_glx.c Wed Feb 15 17:54:51 2012 +1000
1.3 @@ -367,8 +367,8 @@
1.4 if( buffer->tex_id != 0 ) {
1.5 // The pbuffer should already be the current context, but just in case...
1.6 glXMakeContextCurrent( video_x11_display, (GLXPbuffer)buffer->buf_id, (GLXPbuffer)buffer->buf_id, glx_context );
1.7 - glBindTexture( GL_TEXTURE_RECTANGLE_ARB, buffer->tex_id );
1.8 - glCopyTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, 0, 0, buffer->width, buffer->height, 0 );
1.9 + glBindTexture( GL_TEXTURE_2D, buffer->tex_id );
1.10 + glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, buffer->width, buffer->height, 0 );
1.11 }
1.12 }
1.13
1.14 @@ -382,8 +382,8 @@
1.15 glFinish();
1.16 glReadBuffer( GL_FRONT );
1.17 glXMakeContextCurrent( video_x11_display, (GLXPbuffer)buffer->buf_id, (GLXPbuffer)buffer->buf_id, glx_context );
1.18 - glBindTexture( GL_TEXTURE_RECTANGLE_ARB, glx_pbuffer_texture );
1.19 - glCopyTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, 0, 0, buffer->width, buffer->height, 0 );
1.20 + glBindTexture( GL_TEXTURE_2D, glx_pbuffer_texture );
1.21 + glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, buffer->width, buffer->height, 0 );
1.22 video_glx_make_window_current();
1.23 gl_texture_window( buffer->width, buffer->height, glx_pbuffer_texture, buffer->inverted );
1.24 }
.