isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

[cogl-texture] Set GL_PACK_ROW_LENGTH when downloading texture data

Browse Source 
Otherwise the rowstride passed in from an application is not used
correctly so you can not download to an area with a much larger
rowstride.
This commit is contained in:
Neil Roberts 2009-08-24 12:50:57 +01:00
parent 172074fd29
commit 4ca375e8fe
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clutter/cogl/gl/cogl-texture.c
View File

@ -184,8 +184,16 @@ prep_for_gl_pixels_upload (gint pixels_rowstride,
} }
static void static void
prep_for_gl_pixels_download (gint pixels_rowstride) prep_for_gl_pixels_download (gint pixels_rowstride,
gint pixels_src_x,
gint pixels_src_y,
gint pixels_bpp)
{ {
GE( glPixelStorei (GL_PACK_ROW_LENGTH, pixels_rowstride / pixels_bpp) );
GE( glPixelStorei (GL_PACK_SKIP_PIXELS, pixels_src_x) );
GE( glPixelStorei (GL_PACK_SKIP_ROWS, pixels_src_y) );
if (!(pixels_rowstride & 0x7)) if (!(pixels_rowstride & 0x7))
GE( glPixelStorei (GL_PACK_ALIGNMENT, 8) ); GE( glPixelStorei (GL_PACK_ALIGNMENT, 8) );
else if (!(pixels_rowstride & 0x3)) else if (!(pixels_rowstride & 0x3))
@ -404,7 +412,7 @@ _cogl_texture_download_from_gl (CoglTexture *tex,
slice_bmp.height); slice_bmp.height);
/* Setup gl alignment to 0,0 top-left corner */ /* Setup gl alignment to 0,0 top-left corner */
prep_for_gl_pixels_download (slice_bmp.rowstride); prep_for_gl_pixels_download (slice_bmp.rowstride, 0, 0, bpp);
/* Download slice image data into temp bmp */ /* Download slice image data into temp bmp */
GE( glBindTexture (tex->gl_target, gl_handle) ); GE( glBindTexture (tex->gl_target, gl_handle) );
@ -432,7 +440,7 @@ _cogl_texture_download_from_gl (CoglTexture *tex,
+ x_span->start * bpp + x_span->start * bpp
+ y_span->start * target_bmp->rowstride; + y_span->start * target_bmp->rowstride;
prep_for_gl_pixels_download (target_bmp->rowstride); prep_for_gl_pixels_download (target_bmp->rowstride, 0, 0, bpp);
/* Download slice image data */ /* Download slice image data */
GE( glBindTexture (tex->gl_target, gl_handle) ); GE( glBindTexture (tex->gl_target, gl_handle) );