From e477768bd859550930c57a72318c952076b67158 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Mon, 26 Apr 2010 12:41:26 +0100 Subject: [PATCH] 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 --- clutter/cogl/cogl/cogl-texture-2d-sliced.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clutter/cogl/cogl/cogl-texture-2d-sliced.c b/clutter/cogl/cogl/cogl-texture-2d-sliced.c index 9769174..29f346e 100644 --- a/clutter/cogl/cogl/cogl-texture-2d-sliced.c +++ b/clutter/cogl/cogl/cogl-texture-2d-sliced.c @@ -945,8 +945,8 @@ _cogl_texture_2d_sliced_upload_from_data /* Create slices for the given format and size */ if (!_cogl_texture_2d_sliced_slices_create (tex_2ds, - bmp->width, - bmp->height, + dst_bmp.width, + dst_bmp.height, gl_intformat, gl_format, gl_type)) @@ -958,7 +958,7 @@ _cogl_texture_2d_sliced_upload_from_data } if (!_cogl_texture_2d_sliced_upload_to_gl (tex_2ds, - bmp, + &dst_bmp, gl_intformat, gl_format, gl_type)) -- 2.7.4