brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl-texture-2d-sliced: Use the converted bitmap when uploading

Browse Source 
When uploading texture data the cogl-texture-2d-sliced backend was
using _cogl_texture_prepare_for_upload to create a bitmap suitable for
upload but then it was using the original bitmap instead of the new
bitmap for the data. This was causing any format conversions performed
by cogl_texture_prepare_for_upload to be ignored.

http://bugzilla.openedhand.com/show_bug.cgi?id=2059
This commit is contained in:
Neil Roberts 2010-04-26 12:41:26 +01:00
parent dae6ab7d79
commit ebe86985fd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cogl/cogl-texture-2d-sliced.c
View File

@ -945,8 +945,8 @@ _cogl_texture_2d_sliced_upload_from_data
/* Create slices for the given format and size */ /* Create slices for the given format and size */
if (!_cogl_texture_2d_sliced_slices_create (tex_2ds, if (!_cogl_texture_2d_sliced_slices_create (tex_2ds,
bmp->width, dst_bmp.width,
bmp->height, dst_bmp.height,
gl_intformat, gl_intformat,
gl_format, gl_format,
gl_type)) gl_type))
@ -958,7 +958,7 @@ _cogl_texture_2d_sliced_upload_from_data
} }
if (!_cogl_texture_2d_sliced_upload_to_gl (tex_2ds, if (!_cogl_texture_2d_sliced_upload_to_gl (tex_2ds,
bmp, &dst_bmp,
gl_intformat, gl_intformat,
gl_format, gl_format,
gl_type)) gl_type))