mirror of
https://github.com/brl/mutter.git
synced 2024-12-25 04:22:05 +00:00
cogl-texture-2d-sliced: Use the converted bitmap when uploading
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:
parent
405d529f44
commit
e477768bd8
@ -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))
|
||||||
|
Loading…
Reference in New Issue
Block a user